OSDN > Find Software > graphicsmagick > SCM > hg > GM > Commit

graphicsmagick
Fork

GM: Commit

Main GraphicsMagick source repository

Revision	bc8483ab69f9a2752475e122fa60dc024040b865 (tree)
Time	2001-01-03 00:38:24
Author	John Cristy <duc.sequere.aut.de.via.decede@gmai...>
Commiter	John Cristy

*** empty log message ***

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 @@
2639	2639	*/
2640	2640	WriteBlobString(image,"<desc>");
2641	2641	for (q++; (q != '\n') && (q != '\0'); q++)
2642		- WriteBlobByte(image,*q);
	2642	+ switch (*q)
	2643	+ {
	2644	+ case '<': WriteBlobString(image,"<"); break;
	2645	+ case '>': WriteBlobString(image,">"); break;
	2646	+ case '&': WriteBlobString(image,"&"); break;
	2647	+ default: WriteBlobByte(image,*q); break;
	2648	+ }
2643	2649	WriteBlobString(image,"</desc>\n");
2644	2650	continue;
2645	2651	}

		@@ -3232,7 +3238,9 @@
3232	3238	status=False;
3233	3239	break;
3234	3240	}
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,
3236	3244	primitive_info[j+1].point.x,primitive_info[j+1].point.y);
3237	3245	(void) WriteBlobString(image,buffer);
3238	3246	break;

		@@ -3452,10 +3460,13 @@
3452	3460	primitive_info[j].point.x,primitive_info[j].point.y);
3453	3461	(void) WriteBlobString(image,buffer);
3454	3462	for (p=primitive_info[j].text; *p != '\0'; p++)
3455		- if (*p != '&')
3456		- WriteBlobByte(image,*p);
3457		- else
3458		- WriteBlobString(image,"&");
	3463	+ switch (*p)
	3464	+ {
	3465	+ case '<': WriteBlobString(image,"<"); break;
	3466	+ case '>': WriteBlobString(image,">"); break;
	3467	+ case '&': WriteBlobString(image,"&"); break;
	3468	+ default: WriteBlobByte(image,*p); break;
	3469	+ }
3459	3470	(void) WriteBlobString(image,"</text>\n");
3460	3471	break;
3461	3472	}

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 @@
2	2	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
3	3	% %
4	4	% %
	5	+% %
5	6	% AAA TTTTT TTTTT RRRR IIIII BBBB U U TTTTT EEEEE SSSSS %
6	7	% A A T T R R I B B U U T E SS %
7	8	% AAAAA T T RRRR I BBBB U U T EEE SSS %

		@@ -795,8 +796,6 @@
795	796	}
796	797	if (*value == '\0')
797	798	return(False);
798		- if (LocaleCompare(key,"Comment") == 0)
799		- while (SetImageAttribute(image,"Comment",(char *) NULL) != False);
800	799	if (LocaleCompare(key,"Label") == 0)
801	800	while (SetImageAttribute(image,"Label",(char *) NULL) != False);
802	801	if (LocaleCompare(key,"Signature") == 0)

		@@ -821,7 +820,11 @@
821	820	for (p=image->attributes; p != (ImageAttribute *) NULL; p=p->next)
822	821	{
823	822	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	+ }
825	828	if (p->next == (ImageAttribute *) NULL)
826	829	break;
827	830	}