Reformat to better fit the coding standard.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14313 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2002-08-21 14:52  Alexander Malmberg  <alexander@malmberg.org>
+
+	* Source/art/blit.h, Source/art/blit.m, Source/art/ftfont.h,
+	Source/art/ftfont.m: Reformat to fit coding standards better.
+
 2002-08-21 13:50  Alexander Malmberg  <alexander@malmberg.org>
 
 	* Source/art/ARTContext.m: Move common code from _fill and DPSstroke

Source/art/blit.h

@@ -36,21 +36,21 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
 
 typedef struct render_run_s
 {
-	unsigned char r,g,b,a,real_a;
+  unsigned char r, g, b, a, real_a;
-	unsigned char *dst,*dsta;
+  unsigned char *dst, *dsta;
 
   /* the following fields are only used by the svp rendering helpers */
-	int x0,x1;
+  int x0, x1;
-	int rowstride,arowstride,bpp;
+  int rowstride, arowstride, bpp;
-	void (*run_alpha)(struct render_run_s *ri,int num);
+  void (*run_alpha)(struct render_run_s *ri, int num);
-	void (*run_opaque)(struct render_run_s *ri,int num);
+  void (*run_opaque)(struct render_run_s *ri, int num);
 } render_run_t;
 
 
 typedef struct
 {
-	unsigned char *dst,*dsta;
+  unsigned char *dst, *dsta;
-	unsigned char *src,*srca;
+  unsigned char *src, *srca;
 } composite_run_t;
 
 
@@ -74,62 +74,63 @@ typedef struct draw_info_s
 
   int bytes_per_pixel;
   int drawing_depth;
-	int inline_alpha,inline_alpha_ofs;
+  int inline_alpha, inline_alpha_ofs;
 
 
-	void (*render_run_alpha)(render_run_t *ri,int num);
+  void (*render_run_alpha)(render_run_t *ri, int num);
-	void (*render_run_opaque)(render_run_t *ri,int num);
+  void (*render_run_opaque)(render_run_t *ri, int num);
-	void (*render_run_alpha_a)(render_run_t *ri,int num);
+  void (*render_run_alpha_a)(render_run_t *ri, int num);
-	void (*render_run_opaque_a)(render_run_t *ri,int num);
+  void (*render_run_opaque_a)(render_run_t *ri, int num);
 
   void (*render_blit_alpha_opaque)(unsigned char *dst,
 				   const unsigned char *src,
-		unsigned char r,unsigned char g,unsigned char b,int num);
+				   unsigned char r, unsigned char g,
+				   unsigned char b, int num);
   void (*render_blit_mono_opaque)(unsigned char *dst,
-		const unsigned char *src,int src_ofs,
+				  const unsigned char *src, int src_ofs,
-		unsigned char r,unsigned char g,unsigned char b,
+				  unsigned char r, unsigned char g,
-		int num);
+				  unsigned char b, int num);
 
-	void (*render_blit_alpha)(unsigned char *dst,const unsigned char *src,
+  void (*render_blit_alpha)(unsigned char *dst, const unsigned char *src,
-		unsigned char r,unsigned char g,unsigned char b,
+			    unsigned char r, unsigned char g, unsigned char b,
-		unsigned char alpha,int num);
+			    unsigned char alpha, int num);
   void (*render_blit_mono)(unsigned char *dst,
-		const unsigned char *src,int src_ofs,
+			   const unsigned char *src, int src_ofs,
-		unsigned char r,unsigned char g,unsigned char b,
+			   unsigned char r, unsigned char g, unsigned char b,
-		unsigned char alpha,int num);
+			   unsigned char alpha, int num);
 
 
-	void (*composite_sover_aa)(composite_run_t *c,int num);
+  void (*composite_sover_aa)(composite_run_t *c, int num);
-	void (*composite_sover_ao)(composite_run_t *c,int num);
+  void (*composite_sover_ao)(composite_run_t *c, int num);
 
-	void (*composite_sin_aa)(composite_run_t *c,int num);
+  void (*composite_sin_aa)(composite_run_t *c, int num);
-	void (*composite_sin_oa)(composite_run_t *c,int num);
+  void (*composite_sin_oa)(composite_run_t *c, int num);
 
-	void (*composite_sout_aa)(composite_run_t *c,int num);
+  void (*composite_sout_aa)(composite_run_t *c, int num);
-	void (*composite_sout_oa)(composite_run_t *c,int num);
+  void (*composite_sout_oa)(composite_run_t *c, int num);
 
-	void (*composite_satop_aa)(composite_run_t *c,int num);
+  void (*composite_satop_aa)(composite_run_t *c, int num);
 
-	void (*composite_dover_aa)(composite_run_t *c,int num);
+  void (*composite_dover_aa)(composite_run_t *c, int num);
-	void (*composite_dover_oa)(composite_run_t *c,int num);
+  void (*composite_dover_oa)(composite_run_t *c, int num);
 
-	void (*composite_din_aa)(composite_run_t *c,int num);
+  void (*composite_din_aa)(composite_run_t *c, int num);
 
-	void (*composite_dout_aa)(composite_run_t *c,int num);
+  void (*composite_dout_aa)(composite_run_t *c, int num);
 
-	void (*composite_datop_aa)(composite_run_t *c,int num);
+  void (*composite_datop_aa)(composite_run_t *c, int num);
 
-	void (*composite_xor_aa)(composite_run_t *c,int num);
+  void (*composite_xor_aa)(composite_run_t *c, int num);
 
-	void (*composite_plusl_aa)(composite_run_t *c,int num);
+  void (*composite_plusl_aa)(composite_run_t *c, int num);
-	void (*composite_plusl_oa)(composite_run_t *c,int num);
+  void (*composite_plusl_oa)(composite_run_t *c, int num);
-	void (*composite_plusl_ao)(composite_run_t *c,int num);
+  void (*composite_plusl_ao)(composite_run_t *c, int num);
-	void (*composite_plusl_oo)(composite_run_t *c,int num);
+  void (*composite_plusl_oo)(composite_run_t *c, int num);
 
-	void (*composite_plusd_aa)(composite_run_t *c,int num);
+  void (*composite_plusd_aa)(composite_run_t *c, int num);
-	void (*composite_plusd_oa)(composite_run_t *c,int num);
+  void (*composite_plusd_oa)(composite_run_t *c, int num);
-	void (*composite_plusd_ao)(composite_run_t *c,int num);
+  void (*composite_plusd_ao)(composite_run_t *c, int num);
-	void (*composite_plusd_oo)(composite_run_t *c,int num);
+  void (*composite_plusd_oo)(composite_run_t *c, int num);
 } draw_info_t;
 
 #define RENDER_RUN_ALPHA (DI.render_run_alpha)
@@ -143,13 +144,13 @@ typedef struct draw_info_s
 #define RENDER_BLIT_MONO DI.render_blit_mono
 
 void artcontext_setup_draw_info(draw_info_t *di,
-	unsigned int red_mask,unsigned int green_mask,unsigned int blue_mask,
+	unsigned int red_mask, unsigned int green_mask, unsigned int blue_mask,
 	int bpp);
 
-void artcontext_render_svp(const ArtSVP *svp,int x0,int y0,int x1,int y1,
+void artcontext_render_svp(const ArtSVP *svp, int x0, int y0, int x1, int y1,
-	unsigned char r,unsigned char g,unsigned char b,unsigned char a,
+	unsigned char r, unsigned char g, unsigned char b, unsigned char a,
-	unsigned char *dst,int rowstride,
+	unsigned char *dst, int rowstride,
-	unsigned char *dsta,int arowstride,int has_alpha,
+	unsigned char *dsta, int arowstride, int has_alpha,
 	draw_info_t *di);
 
 #endif

Source/art/blit.m

@@ -1567,7 +1567,7 @@ void artcontext_setup_draw_info(draw_info_t *di,
 	}
     }
 
-//	t=DI_32_ARGB; /* HACK */
+  //	t=DI_32_ARGB; /* HACK */
 
   *di=draw_infos[t];
   if (!di->render_run_alpha)
@@ -1576,7 +1576,7 @@ void artcontext_setup_draw_info(draw_info_t *di,
     {
       NSLog(@"Unrecognized color masks: %08x:%08x:%08x %i",
 	    red_mask,green_mask,blue_mask,bpp);
-//		NSLog(@"Attempting to use fallback code (currently unimplemented). This will be _very_ slow!");
+      //		NSLog(@"Attempting to use fallback code (currently unimplemented). This will be _very_ slow!");
       NSLog(@"Please report this along with details on your pixel format "
 	    @"(ie. the four numbers above). (Or better yet, implement it "
 	    @"and send me a patch.)");

Source/art/ftfont.h

@@ -25,12 +25,15 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
 
 @protocol FTFontInfo
 -(void) drawString: (const char *)s
-	at: (int)x:(int)y
+	at: (int)x : (int)y
-	to: (int)x0:(int)y0:(int)x1:(int)y1:(unsigned char *)buf:(int)bpl
+	to: (int)x0 : (int)y0 : (int)x1 : (int)y1
-	color:(unsigned char)r:(unsigned char)g:(unsigned char)b:(unsigned char)alpha
+	: (unsigned char *)buf : (int)bpl
+	color: (unsigned char)r : (unsigned char)g : (unsigned char)b
+	: (unsigned char)alpha
 	transform: (NSAffineTransform *)transform
 	drawinfo: (struct draw_info_s *)di;
 
+/* TODO: see if this is really necessary */
 -(void) drawString: (const char *)s
 	at: (int)x:(int)y
 	to: (int)x0:(int)y0:(int)x1:(int)y1:(unsigned char *)buf:(int)bpl
@@ -39,7 +42,7 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
 	deltas: (const float *)delta_data : (int)delta_size : (int)delta_flags;
 
 -(void) outlineString: (const char *)s
-	at: (float)x:(float)y
+	at: (float)x : (float)y
 	gstate: (void *)func_param;
 
 +(void) initializeBackend;