r5349 tlsa - in /trunk/netsurf: desktop/save_pdf/pdf_plotters.c image/gif.c

netsurf at semichrome.net netsurf at semichrome.net
Tue Sep 16 14:45:59 BST 2008


Author: tlsa
Date: Tue Sep 16 08:45:59 2008
New Revision: 5349

URL: http://source.netsurf-browser.org?rev=5349&view=rev
Log:
Fix warnings.

Modified:
    trunk/netsurf/desktop/save_pdf/pdf_plotters.c
    trunk/netsurf/image/gif.c

Modified: trunk/netsurf/desktop/save_pdf/pdf_plotters.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/save_pdf/pdf_plotters.c?rev=5349&r1=5348&r2=5349&view=diff
==============================================================================
--- trunk/netsurf/desktop/save_pdf/pdf_plotters.c (original)
+++ trunk/netsurf/desktop/save_pdf/pdf_plotters.c Tue Sep 16 08:45:59 2008
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
  /** \file
  * Target independent PDF plotting using Haru Free PDF Library.
  */
@@ -41,7 +41,7 @@
 #define R(x) ((  (x) & 0x0000ff     )/256.0)
 #define G(x) ((( (x) & 0x00ff00)>>8 )/256.0)
 #define B(x) ((( (x) & 0xff0000)>>16)/256.0)
- 
+
 /*#define PDF_DEBUG*/
 
 static bool pdf_plot_clg(colour c);
@@ -137,48 +137,48 @@
 {
 #ifdef PDF_DEBUG
 	LOG(("."));
-#endif		
+#endif
 	apply_clip_and_mode();
-	
-	HPDF_Page_SetLineWidth(pdf_page, line_width);		
-	
+
+	HPDF_Page_SetLineWidth(pdf_page, line_width);
+
 	if (dotted)
 		pdf_set_dotted();
 	else if (dashed)
 		pdf_set_dashed();
-	
+
 	HPDF_Page_SetRGBStroke(pdf_page, R(c), G(c), B(c));
 	HPDF_Page_Rectangle(pdf_page, x0, page_height - y0 + height, width, height);
 	HPDF_Page_Stroke(pdf_page);
-	
+
 	if (dotted||dashed)
 		pdf_set_solid();
 
 	return true;
 }
 
-bool pdf_plot_line(int x0, int y0, int x1, int y1, int width, 
+bool pdf_plot_line(int x0, int y0, int x1, int y1, int width,
 		colour c, bool dotted, bool dashed)
 {
 #ifdef PDF_DEBUG
 	LOG(("."));
-#endif			
-		
+#endif
+
 	apply_clip_and_mode();
-	
+
 	HPDF_Page_SetLineWidth(pdf_page, width);
-			
+
 	if (dotted)
 		pdf_set_dotted();
 	else if (dashed)
 		pdf_set_dashed();
-	
+
 	HPDF_Page_SetRGBStroke(pdf_page, R(c), G(c), B(c));
 	HPDF_Page_SetLineWidth(pdf_page, width);
 	HPDF_Page_MoveTo(pdf_page, x0, page_height - y0);
 	HPDF_Page_LineTo(pdf_page, x1, page_height - y1);
 	HPDF_Page_Stroke(pdf_page);
-	
+
 	if (dotted||dashed)
 		pdf_set_solid();
 
@@ -187,22 +187,22 @@
 
 bool pdf_plot_polygon(int *p, unsigned int n, colour fill)
 {
-	int i;
+	unsigned int i;
 #ifdef PDF_DEBUG
 	int pmaxx = p[0], pmaxy = p[1];
 	int pminx = p[0], pminy = p[1];
 	LOG(("."));
-#endif		
+#endif
 	if (n == 0)
 		return true;
-	
+
 	apply_clip_and_mode();
-	
-	HPDF_Page_SetRGBFill(pdf_page, R(fill), G(fill), B(fill));	
+
+	HPDF_Page_SetRGBFill(pdf_page, R(fill), G(fill), B(fill));
 	HPDF_Page_MoveTo(pdf_page, p[0], page_height - p[1]);
-	
+
 	for (i = 1 ; i<n ; i++) {
-		HPDF_Page_LineTo(pdf_page, p[i*2], page_height - p[i*2+1]);	
+		HPDF_Page_LineTo(pdf_page, p[i*2], page_height - p[i*2+1]);
 #ifdef PDF_DEBUG
 		pmaxx = max(pmaxx, p[i*2]);
 		pmaxy = max(pmaxy, p[i*2+1]);
@@ -210,23 +210,23 @@
 		pminy = min(pminy, p[i*2+1]);
 #endif
 	}
-	
+
 #ifdef PDF_DEBUG
 	LOG(("%d %d %d %d %f", pminx, pminy, pmaxx, pmaxy, page_height-pminy));
 #endif
-		
-	HPDF_Page_LineTo(pdf_page, p[0], page_height - p[1]);	
+
+	HPDF_Page_LineTo(pdf_page, p[0], page_height - p[1]);
 	HPDF_Page_Fill(pdf_page);
 
 	return true;
 }
 
 bool pdf_plot_fill(int x0, int y0, int x1, int y1, colour c)
-{	
+{
 #ifdef PDF_DEBUG
 	LOG(("%d %d %d %d %f %X", x0, y0, x1, y1, page_height-y0, c));
 #endif
-	
+
 	/*Normalize boundaries of the area - to prevent overflows.
 	  It is needed only in a few functions, where integers are subtracted.
 	  When the whole browser window is meant min and max int values are used
@@ -236,13 +236,13 @@
 	y0 = min(max(y0, 0), page_height);
 	x1 = min(max(x1, 0), page_width);
 	y1 = min(max(y1, 0), page_height);
-	
+
 	apply_clip_and_mode();
-	
+
 	HPDF_Page_SetRGBFill(pdf_page, R(c), G(c), B(c));
 	HPDF_Page_Rectangle(pdf_page, x0, page_height - y1, x1-x0, y1-y0);
 	HPDF_Page_Fill(pdf_page);
-	
+
 	return true;
 }
 
@@ -252,7 +252,7 @@
 #ifdef PDF_DEBUG
 	LOG(("%d %d %d %d", clip_x0, clip_y0, clip_x1, clip_y1));
 #endif
-	
+
 	/*Normalize cllipping area - to prevent overflows.
 	  See comment in pdf_plot_fill.
 	*/
@@ -260,13 +260,13 @@
 	last_clip_y0 = min(max(clip_y0, 0), page_height);
 	last_clip_x1 = min(max(clip_x1, 0), page_width);
 	last_clip_y1 = min(max(clip_y1, 0), page_height);
-	
+
 	page_clipped = true;
-	
-	return true;
-}
-
-bool pdf_plot_text(int x, int y, const struct css_style *style, 
+
+	return true;
+}
+
+bool pdf_plot_text(int x, int y, const struct css_style *style,
 		const char *text, size_t length, colour bg, colour c)
 {
 #ifdef PDF_DEBUG
@@ -275,50 +275,50 @@
 	char *word;
 	HPDF_REAL size;
 	float text_bottom_position, descent;
-	
+
 	if (length == 0)
 		return true;
 
 	text_mode_request = true;
 	apply_clip_and_mode();
-	
+
 	if (style->font_size.value.length.unit  == CSS_UNIT_PX)
 		size = style->font_size.value.length.value;
 	else
 		size = css_len2pt(&style->font_size.value.length, style);
-	
+
 	/*this can be removed when export options get added for riscos*/
 #ifdef riscos
 	size *= DEFAULT_EXPORT_SCALE;
-#else		
+#else
 	size *= pdf_scale;
 #endif
-	
+
 	if (size <= 0)
 		return true;
-		
+
 	if (size > HPDF_MAX_FONTSIZE)
 		size = HPDF_MAX_FONTSIZE;
-	
+
 	haru_nsfont_apply_style(style, pdf_doc, pdf_page, &pdf_font);
-	
+
 	descent = size * (HPDF_Font_GetDescent(pdf_font) / 1000.0);
 	text_bottom_position = page_height - y + descent;
-	
+
 	word = (char*) malloc( sizeof(char) * (length+1) );
 	if (word == NULL)
 		return false;
-	
+
 	memcpy(word, text, length);
 	word[length] = '\0';
-	
+
 	HPDF_Page_SetRGBFill(pdf_page, R(c), G(c), B(c));
-	
+
 	HPDF_Page_SetFontAndSize (pdf_page, pdf_font, size);
 	HPDF_Page_TextOut (pdf_page, x, page_height - y, word);
-	
+
 	free(word);
-	
+
 	return true;
 }
 
@@ -326,21 +326,21 @@
 {
 #ifdef PDF_DEBUG
 	LOG(("."));
-#endif		
+#endif
 	apply_clip_and_mode();
-	
+
 	if (filled)
 		HPDF_Page_SetRGBFill(pdf_page, R(c), G(c), B(c));
 	else
 		HPDF_Page_SetRGBStroke(pdf_page, R(c), G(c), B(c));
-	
+
 	HPDF_Page_Circle(pdf_page, x, page_height-y, radius);
-	
+
 	if (filled)
 		HPDF_Page_Fill(pdf_page);
 	else
 		HPDF_Page_Stroke(pdf_page);
-	
+
 	return true;
 }
 
@@ -348,20 +348,20 @@
 {
 #ifdef PDF_DEBUG
 	LOG(("%d %d %d %d %d %X", x, y, radius, angle1, angle2, c));
-#endif		
-	
+#endif
+
 	/*Normalize angles*/
 	angle1 %= 360;
 	angle2 %= 360;
 	if (angle1 > angle2)
 		angle1 -= 360;
-	
+
 	apply_clip_and_mode();
-	
+
 	HPDF_Page_SetRGBStroke(pdf_page, R(c), G(c), B(c));
-	
+
 	HPDF_Page_Arc(pdf_page, x, page_height-y, radius, angle1, angle2);
-	
+
 	HPDF_Page_Stroke(pdf_page);
 	return true;
 }
@@ -377,19 +377,19 @@
 #endif
  	if (width == 0 || height == 0)
  		return true;
-	
+
 	apply_clip_and_mode();
-	
-	image = pdf_extract_image(bitmap, content);	
-	
+
+	image = pdf_extract_image(bitmap, content);
+
 	if (!image)
 		return false;
-	
+
 	HPDF_Page_DrawImage(pdf_page, image,
 			x, page_height-y-height,
-			width, height);	
-	return true;
-	
+			width, height);
+	return true;
+
 
 }
 
@@ -398,39 +398,39 @@
   		bool repeat_x, bool repeat_y, struct content *content)
 {
 	HPDF_Image image;
-	
+
 #ifdef PDF_DEBUG
 	LOG(("%d %d %d %d %X %X %X", x, y, width, height,
 	     bitmap, bg, content));
 #endif
  	if (width == 0 || height == 0)
- 		return true;	
-	
+ 		return true;
+
 	apply_clip_and_mode();
-		
-	image = pdf_extract_image(bitmap, content);	
-	
+
+	image = pdf_extract_image(bitmap, content);
+
 	if (image) {
 		/*The position of the next tile*/
-		HPDF_REAL current_x, current_y ;	
+		HPDF_REAL current_x, current_y ;
 		HPDF_REAL max_width, max_height;
-		
+
 		max_width =  (repeat_x ? page_width : width);
 		max_height = (repeat_y ? page_height: height);
-		
-		
+
+
 		for (current_y=0; current_y < max_height; current_y += height)
 			for (current_x=0; current_x < max_width; current_x += width)
 				HPDF_Page_DrawImage(pdf_page, image,
 						current_x + x,
       						page_height-current_y - y - height,
       						width, height);
-		
+
 		return true;
 	}
 	else
 		return false;
-	
+
 	return true;
 }
 
@@ -440,7 +440,7 @@
 	char *img_buffer, *rgb_buffer, *alpha_buffer;
 	int img_width, img_height, img_rowstride;
 	int i, j;
-	
+
 	if (content) {
 		/*Not sure if I don't have to check if downloading has been
 		finished.
@@ -453,102 +453,102 @@
  						content->source_data,
  						content->source_size);
  				break;
-			
+
 			/*Disabled until HARU PNG support will be more stable.
-			
+
 			case CONTENT_PNG:
 				image = HPDF_LoadPngImageFromMem(pdf_doc,
 						content->source_data,
 						content->total_size);
-				break;*/	
+				break;*/
 			default:
 				break;
-		}	
-	}
-	
+		}
+	}
+
 	if (!image) {
 		/*Handle pixmaps*/
 		img_buffer = bitmap_get_buffer(bitmap);
 		img_width = bitmap_get_width(bitmap);
 		img_height = bitmap_get_height(bitmap);
 		img_rowstride = bitmap_get_rowstride(bitmap);
-		
+
 		rgb_buffer = (char*)malloc(3 * img_width * img_height);
 		if (rgb_buffer == NULL) {
 			LOG(("Not enough memory to create RGB buffer"));
 			return NULL;
 		}
-		
+
 		alpha_buffer = (char*)malloc(img_width * img_height);
 		if (alpha_buffer == NULL) {
 			LOG(("Not enough memory to create alpha buffer"));
 			free(rgb_buffer);
 			return NULL;
 		}
-		
-			
+
+
 		for (i = 0; i<img_height; i++)
 			for (j = 0 ; j<img_width ; j++) {
 				rgb_buffer[((i * img_width) + j) * 3] =
 				  img_buffer[(i * img_rowstride) + (j * 4)];
-				
+
 				rgb_buffer[(((i * img_width) + j) * 3) + 1] =
 				  img_buffer[(i * img_rowstride) + (j * 4) + 1];
-				
+
 				rgb_buffer[(((i * img_width) + j) * 3) + 2] =
 				  img_buffer[(i * img_rowstride) + (j * 4) + 2];
-				
+
 				alpha_buffer[(i * img_width)+j] =
 				  img_buffer[(i * img_rowstride) + (j * 4) + 3];
 			}
-			
+
 			smask = HPDF_LoadRawImageFromMem(pdf_doc, alpha_buffer,
 							img_width, img_height,
      							HPDF_CS_DEVICE_GRAY, 8);
-		
+
 			image = HPDF_LoadRawImageFromMem(pdf_doc, rgb_buffer,
 							img_width, img_height,
      							HPDF_CS_DEVICE_RGB, 8);
-		
+
 			if (HPDF_Image_AddSMask(pdf_doc, image,smask) != HPDF_OK)
 				image = NULL;
-		
+
 			free(rgb_buffer);
 			free(alpha_buffer);
 	}
-	
+
 	return image;
 }
 /**change the mode and clip only if it's necessary*/
 static void apply_clip_and_mode()
 {
-	
+
 	if (in_text_mode && (!text_mode_request || page_clipped)) {
 		HPDF_Page_EndText(pdf_page);
-		in_text_mode = false;		
-	}
-	
+		in_text_mode = false;
+	}
+
 	if (page_clipped) {
-		
+
 		HPDF_Page_GRestore(pdf_page);
 		HPDF_Page_GSave(pdf_page);
 
 		HPDF_Page_Rectangle(pdf_page, last_clip_x0,
-				page_height - last_clip_y1, 
+				page_height - last_clip_y1,
 				last_clip_x1 - last_clip_x0,
 				last_clip_y1 - last_clip_y0);
 		HPDF_Page_Clip(pdf_page);
 		HPDF_Page_EndPath(pdf_page);
-				
+
 		page_clipped = false;
-	}	
-	
+	}
+
 	if (text_mode_request) {
 		if (!in_text_mode) {
-			HPDF_Page_BeginText(pdf_page);			
+			HPDF_Page_BeginText(pdf_page);
 			in_text_mode = true;
 		}
-		
+
 		text_mode_request = false;
 	}
 }
@@ -569,34 +569,34 @@
 {
 #ifdef PDF_DEBUG
 	LOG(("."));
-#endif		    
+#endif
 	unsigned int i;
 	bool empty_path = true;
 
 	if (n == 0)
 		return true;
-	
+
 	if ((c == TRANSPARENT) && (fill == TRANSPARENT))
 		return true;
-	
+
 	if (p[0] != PLOTTER_PATH_MOVE) {
 		return false;
 	}
-	
+
 	HPDF_Page_SetRGBFill(pdf_page, R(fill), G(fill), B(fill));
 	HPDF_Page_SetRGBStroke(pdf_page, R(c), G(c), B(c));
-	
+
 	transform[0] = 0.1;
 	transform[1] = 0;
 	transform[2] = 0;
-	transform[3] = -0.1;	
+	transform[3] = -0.1;
 	transform[4] = 0;
-	transform[5] = 0;	
-	
+	transform[5] = 0;
+
 	for (i = 0 ; i<n ; ) {
 		if (p[i] == PLOTTER_PATH_MOVE) {
-			HPDF_Page_MoveTo(pdf_page, 
-					transform_x(transform, p[i+1], p[i+2]), 
+			HPDF_Page_MoveTo(pdf_page,
+					transform_x(transform, p[i+1], p[i+2]),
 					transform_y(transform, p[i+1], p[i+2]));
 			i+= 3;
 		} else if (p[i] == PLOTTER_PATH_CLOSE) {
@@ -604,13 +604,13 @@
 				HPDF_Page_ClosePath(pdf_page);
 			i++;
 		} else if (p[i] == PLOTTER_PATH_LINE) {
-			HPDF_Page_LineTo(pdf_page, 
-					transform_x(transform, p[i+1], p[i+2]), 
+			HPDF_Page_LineTo(pdf_page,
+					transform_x(transform, p[i+1], p[i+2]),
 					transform_y(transform, p[i+1], p[i+2]));
 			i+=3;
 			empty_path = false;
 		} else if (p[i] == PLOTTER_PATH_BEZIER) {
-			HPDF_Page_CurveTo(pdf_page, 
+			HPDF_Page_CurveTo(pdf_page,
 					transform_x(transform, p[i+1], p[i+2]),
 					transform_y(transform, p[i+1], p[i+2]),
 					transform_x(transform, p[i+3], p[i+4]),
@@ -629,7 +629,7 @@
 		HPDF_Page_EndPath(pdf_page);
 		return true;
 	}
-	
+
 	if (fill!=TRANSPARENT) {
 		if (c != TRANSPARENT)
 			HPDF_Page_FillStroke(pdf_page);
@@ -638,7 +638,7 @@
 	}
 	else
 		HPDF_Page_Stroke(pdf_page);
-	
+
 	return true;
 }
 
@@ -649,50 +649,50 @@
 
 void pdf_set_dashed()
 {
-	HPDF_UINT16 dash_ptn[] = {3};	
+	HPDF_UINT16 dash_ptn[] = {3};
 	HPDF_Page_SetDash(pdf_page, dash_ptn, 1, 1);
 }
 
 void pdf_set_dotted()
 {
-	HPDF_UINT16 dash_ptn[] = {1};	
+	HPDF_UINT16 dash_ptn[] = {1};
 	HPDF_Page_SetDash(pdf_page, dash_ptn, 1, 1);
 }
 
-/** 
+/**
  * Begin pdf plotting - initialize a new document
  * \param path Output file path
  * \param pg_width page width
- * \param pg_height page height	
+ * \param pg_height page height
  */
 bool pdf_begin(struct print_settings *print_settings)
 {
 	pdf_doc = NULL;
-	
+
 	pdf_doc = HPDF_New(error_handler, NULL);
 	if (!pdf_doc) {
 		LOG(("Error creating pdf_doc"));
 		return false;
 	}
-	
+
 	settings = print_settings;
-	
-	page_width = settings->page_width - settings->margins[MARGINLEFT] - 
+
+	page_width = settings->page_width - settings->margins[MARGINLEFT] -
 			settings->margins[MARGINRIGHT];
-	
+
 	page_height = settings->page_height - settings->margins[MARGINTOP];
-	
+
 
 	if (option_enable_PDF_compression)
 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
 
 	pdf_font = HPDF_GetFont (pdf_doc, "Times-Roman", "StandardEncoding");
-	
+
 	pdf_page = NULL;
-	
+
 #ifdef PDF_DEBUG
 	LOG(("pdf_begin finishes"));
-#endif	
+#endif
 	return true;
 }
 
@@ -711,22 +711,22 @@
 	pdf_page = HPDF_AddPage(pdf_doc);
 	if (pdf_page == NULL)
 		return false;
-	
+
 	HPDF_Page_SetWidth (pdf_page, settings->page_width);
 	HPDF_Page_SetHeight(pdf_page, settings->page_height);
-	
+
 	HPDF_Page_Concat(pdf_page,1,0,0,1,settings->margins[MARGINLEFT],0);
-	
+
 	page_clipped = false;
 	HPDF_Page_GSave(pdf_page);
-	
+
 	text_mode_request = false;
 	in_text_mode = false;
-	
+
 #ifdef PDF_DEBUG
 	LOG(("%f %f", page_width, page_height));
 #endif
-	
+
 	return true;
 }
 
@@ -744,12 +744,12 @@
 		pdf_plot_grid(100, 100, 0xCCCCFF);
 	}
 #endif
-	
+
 	if (settings->output != NULL)
 		path = strdup(settings->output);
 	else
 		path = NULL;
-	
+
 	/*Encryption on*/
 	if (option_enable_PDF_password)
 		PDF_Password(&owner_pass, &user_pass, path);
@@ -763,26 +763,26 @@
 void save_pdf(char *path)
 {
 	bool success = false;
-	
+
 	if (option_enable_PDF_password && owner_pass != NULL ) {
 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
 		free(owner_pass);
 		free(user_pass);
 	}
-	
+
 	if (path != NULL) {
 		if (HPDF_SaveToFile(pdf_doc, path) != HPDF_OK)
 			remove(path);
 		else
 			success = true;
-		
-		free(path);		
-	}
-	
+
+		free(path);
+	}
+
 	if (!success)
 		warn_user("Unable to save PDF file.", 0);
-	
+
 	HPDF_Free(pdf_doc);
 }
 
@@ -798,9 +798,9 @@
 {
 	LOG(("ERROR:\n\terror_no=%x\n\tdetail_no=%d\n",	(HPDF_UINT)error_no,
 			(HPDF_UINT)detail_no));
-#ifdef PDF_DEBUG	
+#ifdef PDF_DEBUG
 	exit(1);
-#endif	
+#endif
 }
 
 /**
@@ -811,13 +811,13 @@
 void pdf_plot_grid(int x_dist, int y_dist, unsigned int colour)
 {
 	int i;
-	
+
 	for (int i = x_dist ; i < page_width ; i += x_dist)
 		pdf_plot_line(i, 0, i, page_height, 1, colour, false, false);
-	
+
 	for (int i = y_dist ; i < page_height ; i += x_dist)
 		pdf_plot_line(0, i, page_width, i, 1, colour, false, false);
-	
+
 }
 #endif
 

Modified: trunk/netsurf/image/gif.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/gif.c?rev=5349&r1=5348&r2=5349&view=diff
==============================================================================
--- trunk/netsurf/image/gif.c (original)
+++ trunk/netsurf/image/gif.c Tue Sep 16 08:45:59 2008
@@ -171,8 +171,6 @@
 		float scale, unsigned long background_colour,
 		bool repeat_x, bool repeat_y)
 {
-	gif_result res;
-
 	if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
 		if (nsgif_get_frame(c) != GIF_OK)
 			return false;




More information about the netsurf-commits mailing list