@@ -5171,20 +5171,19 @@ static void MSLStartElement(void *context,const xmlChar *tag,
51715171 }
51725172 else if (LocaleCompare ((const char * ) tag ,"repage" ) == 0 )
51735173 {
5174- /* init the values */
5175- width = msl_info -> image [n ]-> page .width ;
5176- height = msl_info -> image [n ]-> page .height ;
5177- x = msl_info -> image [n ]-> page .x ;
5178- y = msl_info -> image [n ]-> page .y ;
5179-
51805174 if ((n < 1 ) || (msl_info -> image [n ] == (Image * ) NULL ))
51815175 {
51825176 ThrowMSLException (OptionError ,"NoImagesDefined" ,
51835177 (const char * ) tag );
51845178 break ;
51855179 }
5180+ /* init the values */
5181+ width = msl_info -> image [n ]-> page .width ;
5182+ height = msl_info -> image [n ]-> page .height ;
5183+ x = msl_info -> image [n ]-> page .x ;
5184+ y = msl_info -> image [n ]-> page .y ;
51865185 if (attributes == (const xmlChar * * ) NULL )
5187- break ;
5186+ break ;
51885187 for (i = 0 ; (attributes [i ] != (const xmlChar * ) NULL ); i ++ )
51895188 {
51905189 keyword = (const char * ) attributes [i ++ ];
@@ -5537,7 +5536,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
55375536 ThrowMSLException (OptionError ,"NoImagesDefined" ,
55385537 (const char * ) tag );
55395538 break ;
5540- }
5539+ }
55415540 SetGeometry (msl_info -> image [n ],& geometry );
55425541 if (attributes != (const xmlChar * * ) NULL )
55435542 for (i = 0 ; (attributes [i ] != (const xmlChar * ) NULL ); i ++ )
@@ -5606,19 +5605,18 @@ static void MSLStartElement(void *context,const xmlChar *tag,
56065605 }
56075606 else if (LocaleCompare ((const char * ) tag ,"roll" ) == 0 )
56085607 {
5609- /* init the values */
5610- width = msl_info -> image [n ]-> columns ;
5611- height = msl_info -> image [n ]-> rows ;
5612- x = y = 0 ;
5613-
56145608 if ((n < 1 ) || (msl_info -> image [n ] == (Image * ) NULL ))
56155609 {
56165610 ThrowMSLException (OptionError ,"NoImagesDefined" ,
56175611 (const char * ) tag );
56185612 break ;
56195613 }
5614+ /* init the values */
5615+ width = msl_info -> image [n ]-> columns ;
5616+ height = msl_info -> image [n ]-> rows ;
5617+ x = y = 0 ;
56205618 if (attributes == (const xmlChar * * ) NULL )
5621- break ;
5619+ break ;
56225620 for (i = 0 ; (attributes [i ] != (const xmlChar * ) NULL ); i ++ )
56235621 {
56245622 keyword = (const char * ) attributes [i ++ ];
0 commit comments