Ondřej Surý avatar Ondřej Surý committed 88d42fd Merge

Merged in remicollet/gd-libgd/issue-warnings (pull request #5)

gd_color_map.c:765:52: warning: redeclaration of 'GD_COLOR_MAP_X11' with different visibility (old visibility preserved) [enabled by default]

Comments (5)

  1. Remi Collet

    Hmm.. it something strange happen. 8 yesterday commits was lost in this merge (already applied by me in master) Those commits fix all the warnings build

    Can you please clarify ?

Files changed (7)

src/gd_color_map.c

 	{"yellow4", 139, 139, 0},
 };
 
-BGD_EXPORT_DATA_IMPL gdColorMap GD_COLOR_MAP_X11 = {
+BGD_EXPORT_DATA_PROT gdColorMap GD_COLOR_MAP_X11 = {
 	sizeof(GD_COLOR_MAP_X11_ENTRIES)/sizeof(gdColorMapEntry),
 	(gdColorMapEntry *)GD_COLOR_MAP_X11_ENTRIES
 };
 gdImagePtr gdImageRotate45 (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent)
 {
 	gdImagePtr dst1,dst2,dst3;
-	FuncPtr f;
 	double dRadAngle, dSinE, dTan, dShear;
 	double dOffset;     /* Variable skew offset */
 	int u, iShear, newx, newy;
 	newy = src->sy;
 
 	/* 1st shear */
-	if (src->trueColor) {
-		f = gdImageGetTrueColorPixel;
-	} else {
-		f = gdImageGetPixel;
-	}
-
 	dst1 = gdImageCreateTrueColor(newx, newy);
 	/******* Perform 1st shear (horizontal) ******/
 	if (dst1 == NULL) {
 
 	newy = (int) ((double) src->sx * fabs( dSinE ) + (double) src->sy * cos (dRadAngle))+1;
 
-	if (src->trueColor) {
-		f = gdImageGetTrueColorPixel;
-	} else {
-		f = gdImageGetPixel;
-	}
 	dst2 = gdImageCreateTrueColor(newx, newy);
 	if (dst2 == NULL) {
 		gdImageDestroy(dst1);
 	newx = (int) ((double)src->sy * fabs (dSinE) + (double)src->sx * cos (dRadAngle)) + 1;
 	newy = dst2->sy;
 
-	if (src->trueColor) {
-		f = gdImageGetTrueColorPixel;
-	} else {
-		f = gdImageGetPixel;
-	}
 	dst3 = gdImageCreateTrueColor(newx, newy);
 	if (dst3 == NULL) {
 		gdImageDestroy(dst2);
 	gdFontGiantData
 };
 
-BGD_EXPORT_DATA_IMPL gdFontPtr gdFontGiant = &gdFontGiantRep;
+BGD_EXPORT_DATA_PROT gdFontPtr gdFontGiant = &gdFontGiantRep;
 
 BGD_DECLARE(gdFontPtr) gdFontGetGiant (void)
 {
 	gdFontLargeData
 };
 
-BGD_EXPORT_DATA_IMPL gdFontPtr gdFontLarge = &gdFontLargeRep;
+BGD_EXPORT_DATA_PROT gdFontPtr gdFontLarge = &gdFontLargeRep;
 
 BGD_DECLARE(gdFontPtr)
 gdFontGetLarge (void)
 	gdFontMediumBoldData
 };
 
-BGD_EXPORT_DATA_IMPL gdFontPtr gdFontMediumBold = &gdFontMediumBoldRep;
+BGD_EXPORT_DATA_PROT gdFontPtr gdFontMediumBold = &gdFontMediumBoldRep;
 
 BGD_DECLARE(gdFontPtr)
 gdFontGetMediumBold (void)
 	gdFontSmallData
 };
 
-BGD_EXPORT_DATA_IMPL gdFontPtr gdFontSmall = &gdFontSmallRep;
+BGD_EXPORT_DATA_PROT gdFontPtr gdFontSmall = &gdFontSmallRep;
 
 BGD_DECLARE(gdFontPtr)
 gdFontGetSmall (void)
 		gd_error ("iconv_open() error");
 #ifdef HAVE_ERRNO_H
 		if (errno == EINVAL)
-			error ("invalid code specification: \"%s\" or \"%s\"", EUCSTR, code);
+			gd_error ("invalid code specification: \"%s\" or \"%s\"", EUCSTR, code);
 #endif
 		ustrcpy (to, from);
 		return;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.