• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révisionbc8483ab69f9a2752475e122fa60dc024040b865 (tree)
l'heure2001-01-03 00:38:24
AuteurJohn Cristy <duc.sequere.aut.de.via.decede@gmai...>
CommiterJohn Cristy

Message de Log

*** empty log message ***

Change Summary

Modification

diff -r 998503e5086b -r bc8483ab69f9 coders/svg.c
--- a/coders/svg.c Tue Jan 02 09:17:42 2001 -0600
+++ b/coders/svg.c Tue Jan 02 09:38:24 2001 -0600
@@ -2639,7 +2639,13 @@
26392639 */
26402640 WriteBlobString(image,"<desc>");
26412641 for (q++; (*q != '\n') && (*q != '\0'); q++)
2642- WriteBlobByte(image,*q);
2642+ switch (*q)
2643+ {
2644+ case '<': WriteBlobString(image,"&lt;"); break;
2645+ case '>': WriteBlobString(image,"&gt;"); break;
2646+ case '&': WriteBlobString(image,"&amp;"); break;
2647+ default: WriteBlobByte(image,*q); break;
2648+ }
26432649 WriteBlobString(image,"</desc>\n");
26442650 continue;
26452651 }
@@ -3232,7 +3238,9 @@
32323238 status=False;
32333239 break;
32343240 }
3235- (void) FormatString(buffer," <ellipse rx=\"%g\" ry=\"%g\"/>\n",
3241+ (void) FormatString(buffer,
3242+ " <ellipse cx=\"%g\" cy=\"%g\" rx=\"%g\" ry=\"%g\"/>\n",
3243+ primitive_info[j].point.x,primitive_info[j].point.y,
32363244 primitive_info[j+1].point.x,primitive_info[j+1].point.y);
32373245 (void) WriteBlobString(image,buffer);
32383246 break;
@@ -3452,10 +3460,13 @@
34523460 primitive_info[j].point.x,primitive_info[j].point.y);
34533461 (void) WriteBlobString(image,buffer);
34543462 for (p=primitive_info[j].text; *p != '\0'; p++)
3455- if (*p != '&')
3456- WriteBlobByte(image,*p);
3457- else
3458- WriteBlobString(image,"&amp;");
3463+ switch (*p)
3464+ {
3465+ case '<': WriteBlobString(image,"&lt;"); break;
3466+ case '>': WriteBlobString(image,"&gt;"); break;
3467+ case '&': WriteBlobString(image,"&amp;"); break;
3468+ default: WriteBlobByte(image,*p); break;
3469+ }
34593470 (void) WriteBlobString(image,"</text>\n");
34603471 break;
34613472 }
diff -r 998503e5086b -r bc8483ab69f9 magick/attributes.c
--- a/magick/attributes.c Tue Jan 02 09:17:42 2001 -0600
+++ b/magick/attributes.c Tue Jan 02 09:38:24 2001 -0600
@@ -2,6 +2,7 @@
22 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
33 % %
44 % %
5+% %
56 % AAA TTTTT TTTTT RRRR IIIII BBBB U U TTTTT EEEEE SSSSS %
67 % A A T T R R I B B U U T E SS %
78 % AAAAA T T RRRR I BBBB U U T EEE SSS %
@@ -795,8 +796,6 @@
795796 }
796797 if (*value == '\0')
797798 return(False);
798- if (LocaleCompare(key,"Comment") == 0)
799- while (SetImageAttribute(image,"Comment",(char *) NULL) != False);
800799 if (LocaleCompare(key,"Label") == 0)
801800 while (SetImageAttribute(image,"Label",(char *) NULL) != False);
802801 if (LocaleCompare(key,"Signature") == 0)
@@ -821,7 +820,11 @@
821820 for (p=image->attributes; p != (ImageAttribute *) NULL; p=p->next)
822821 {
823822 if (LocaleCompare(attribute->key,p->key) == 0)
824- break;
823+ {
824+ ConcatenateString(&p->value,attribute->value);
825+ LiberateMemory((void **) &attribute->value);
826+ LiberateMemory((void **) &attribute->key);
827+ }
825828 if (p->next == (ImageAttribute *) NULL)
826829 break;
827830 }
Afficher sur ancien navigateur de dépôt.