2004-02-16 Jim Evins <evins@snaught.com>

	* src/xml-label-04.c: (xml04_parse_image_props):
	* src/xml-label-191.c: (xml191_parse_image_props):
	* src/xml-label.c: (xml_parse_object_image):
		Delay setting image size until after image has been applied to new
		object.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@416 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index a5eae24c22d5b7ea866c3f60b63f20b4edcd641b..e03e65568d687a9568c3db7858576f441671c211 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-16  Jim Evins  <evins@snaught.com>
+
+       * src/xml-label-04.c: (xml04_parse_image_props):
+       * src/xml-label-191.c: (xml191_parse_image_props):
+       * src/xml-label.c: (xml_parse_object_image):
+               Delay setting image size until after image has been applied to new
+               object.
+       
 2004-02-15  Jim Evins  <evins@snaught.com>
 
        * src/label-barcode.c: (gl_label_barcode_set_data),

diff --git a/glabels2/src/xml-label-04.c b/glabels2/src/xml-label-04.c
index 152457dc6375a6c2a536047ff10c548d8d602a8a..3da7fc202a5e1b34e9703d81bd55a42ba4171add 100644 (file)
--- a/glabels2/src/xml-label-04.c
+++ b/glabels2/src/xml-label-04.c
@@ -392,16 +392,16 @@ xml04_parse_image_props (xmlNodePtr    node,
 
        gl_debug (DEBUG_XML, "START");
 
-       w = gl_xml_get_prop_double (node, "w", 0);
-       h = gl_xml_get_prop_double (node, "h", 0);
-       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
-
        filename = g_new0 (glTextNode, 1);
        filename->field_flag = FALSE;
        filename->data = xmlGetProp (node, "filename");
        gl_label_image_set_filename (object, filename);
        gl_text_node_free (&filename);
 
+       w = gl_xml_get_prop_double (node, "w", 0);
+       h = gl_xml_get_prop_double (node, "h", 0);
+       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
+
        gl_debug (DEBUG_XML, "END");
 }
 

diff --git a/glabels2/src/xml-label-191.c b/glabels2/src/xml-label-191.c
index 87d0c50b29b45cdc306b95fb47a8aba42b115515..24ecab008c5a56952910b07368a4e361b6d2825a 100644 (file)
--- a/glabels2/src/xml-label-191.c
+++ b/glabels2/src/xml-label-191.c
@@ -488,8 +488,8 @@ xml191_parse_image_props (xmlNodePtr  node,
                }
        }
 
-       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
        gl_label_image_set_filename (GL_LABEL_IMAGE(object), filename);
+       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
 
        gl_text_node_free (&filename);
 

diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c
index c08394ae6a54dab32e2ddfb611a04ec45d60f8ea..d90c89e909dae3cdc02c95339c3275cb4d754964 100644 (file)
--- a/glabels2/src/xml-label.c
+++ b/glabels2/src/xml-label.c
@@ -626,11 +626,6 @@ xml_parse_object_image (xmlNodePtr  node,
        y = gl_xml_get_prop_length (node, "y", 0.0);
        gl_label_object_set_position (GL_LABEL_OBJECT(object), x, y);
 
-       /* size attrs */
-       w = gl_xml_get_prop_length (node, "w", 0);
-       h = gl_xml_get_prop_length (node, "h", 0);
-       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
-
        /* src or field attr */
        string = xmlGetProp (node, "src");
        if ( string ) {
@@ -652,6 +647,11 @@ xml_parse_object_image (xmlNodePtr  node,
                }
        }
 
+       /* size attrs */
+       w = gl_xml_get_prop_length (node, "w", 0);
+       h = gl_xml_get_prop_length (node, "h", 0);
+       gl_label_object_set_size (GL_LABEL_OBJECT(object), w, h);
+
        /* affine attrs */
        affine[0] = gl_xml_get_prop_double (node, "a0", 0.0);
        affine[1] = gl_xml_get_prop_double (node, "a1", 0.0);