gEDA-cvs: pcb.git: branch: master updated (b53374c749b9b5f8a65434c3deb71ef026f6fc76)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  b53374c749b9b5f8a65434c3deb71ef026f6fc76 (commit)
      from  449854241c93d4c8c3b7555c0edd8ed04f0aa58e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/png/png.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


=================
 Commit Messages
=================

commit b53374c749b9b5f8a65434c3deb71ef026f6fc76
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix photo-mode mask layer.
    
    The addition of mask support to PNG export broke photo mode; this patch
    undoes the mask support when photo mode is enabled.

:100644 100644 47d8540... 89e40e3... M	src/hid/png/png.c

=========
 Changes
=========

commit b53374c749b9b5f8a65434c3deb71ef026f6fc76
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix photo-mode mask layer.
    
    The addition of mask support to PNG export broke photo mode; this patch
    undoes the mask support when photo mode is enabled.

diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 47d8540..89e40e3 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -360,6 +360,7 @@ png_hid_export_to_file (FILE * the_file, HID_Attr_Val * options)
       if (photo_mode)
 	{
 	  int i, n=0;
+	  SET_FLAG (SHOWMASKFLAG, PCB);
 	  if (comp_layer < solder_layer)
 	    for (i = comp_layer; i <= solder_layer; i++)
 	      photo_groups[n++] = i;
@@ -1040,6 +1041,9 @@ png_destroy_gc (hidGC gc)
 static void
 png_use_mask (int use_it)
 {
+  if (photo_mode)
+    return;
+
   if (use_it == HID_MASK_CLEAR)
     {
       return;




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs