dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turned C++ style comments into C style ones. 

Turned C++ style comments into C style ones.
This commit is contained in:
Daniel Egger 2000-09-26 22:54:33 +00:00
parent bc4f613d77
commit e13fcd8b1f
25 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
Wed Sep 27 00:46:31 CEST 2000 Daniel Egger <egger@suse.de>
* app/channel_ops.c:
* app/convert.c:
* app/tile_manager.c:
* plug-ins/Lighting/lighting_ui.c:
* plug-ins/common/jpeg.c:
* plug-ins/common/winclipboard.c:
* plug-ins/sel2path/spline.c:
* plug-ins/twain/tw_func.h:
* plug-ins/twain/tw_util.h:
* plug-ins/twain/twain.h:
* plug-ins/winsnap/winsnap.c: Turned C++ style comments into
C ones.
Mon Sep 25 17:04:39 PDT 2000 Manish Singh <yosh@gimp.org>
* plug-ins/print/print-canon.c: portability fix for varargs usage

2
app/base/tile-manager.c
View File

@ -255,7 +255,7 @@ tile_manager_validate (TileManager *tm,
/* DEBUG STUFF -> if (tm->user_data)
{
// fprintf(stderr,"V%p ",tm->user_data);
fprintf(stderr,"V%p ",tm->user_data);
fprintf(stderr,"V");
}
else

6
app/channel_ops.c
View File

@ -776,9 +776,9 @@ duplicate_projection (GimpImage *oldgimage, GimpImage *newgimage,
gimage_invalidate_without_render (gdisp->gimage, 0,0,
gdisp->gimage->width,
gdisp->gimage->height,
// 64,64,128,128);
// newgdisplay->disp_width,newgdisplay->disp_height,
// newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset
64,64,128,128);
/* newgdisplay->disp_width,newgdisplay->disp_height,
newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset */
x1, y1, x2, y2
);

6
app/convert.c
View File

@ -2168,9 +2168,9 @@ update_box_rgb (Histogram histogram,
finished_axesscan:
/*
// boxp->Rhalferror = (Rmin+Rmax)/2;
// boxp->Ghalferror = (Gmin+Gmax)/2;
// boxp->Bhalferror = (Bmin+Bmax)/2;
boxp->Rhalferror = (Rmin+Rmax)/2;
boxp->Ghalferror = (Gmin+Gmax)/2;
boxp->Bhalferror = (Bmin+Bmax)/2;
*/
/*boxp->error = (sqrt((double)(boxp->error/ccount)));*/

6
app/core/gimpdrawable-offset.c
View File

@ -776,9 +776,9 @@ duplicate_projection (GimpImage *oldgimage, GimpImage *newgimage,
gimage_invalidate_without_render (gdisp->gimage, 0,0,
gdisp->gimage->width,
gdisp->gimage->height,
// 64,64,128,128);
// newgdisplay->disp_width,newgdisplay->disp_height,
// newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset
64,64,128,128);
/* newgdisplay->disp_width,newgdisplay->disp_height,
newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset */
x1, y1, x2, y2
);

6
app/core/gimpimage-convert.c
View File

@ -2168,9 +2168,9 @@ update_box_rgb (Histogram histogram,
finished_axesscan:
/*
// boxp->Rhalferror = (Rmin+Rmax)/2;
// boxp->Ghalferror = (Gmin+Gmax)/2;
// boxp->Bhalferror = (Bmin+Bmax)/2;
boxp->Rhalferror = (Rmin+Rmax)/2;
boxp->Ghalferror = (Gmin+Gmax)/2;
boxp->Bhalferror = (Bmin+Bmax)/2;
*/
/*boxp->error = (sqrt((double)(boxp->error/ccount)));*/

6
app/core/gimpimage-duplicate.c
View File

@ -776,9 +776,9 @@ duplicate_projection (GimpImage *oldgimage, GimpImage *newgimage,
gimage_invalidate_without_render (gdisp->gimage, 0,0,
gdisp->gimage->width,
gdisp->gimage->height,
// 64,64,128,128);
// newgdisplay->disp_width,newgdisplay->disp_height,
// newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset
64,64,128,128);
/* newgdisplay->disp_width,newgdisplay->disp_height,
newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset */
x1, y1, x2, y2
);

6
app/gimpdrawable-offset.c
View File

@ -776,9 +776,9 @@ duplicate_projection (GimpImage *oldgimage, GimpImage *newgimage,
gimage_invalidate_without_render (gdisp->gimage, 0,0,
gdisp->gimage->width,
gdisp->gimage->height,
// 64,64,128,128);
// newgdisplay->disp_width,newgdisplay->disp_height,
// newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset
64,64,128,128);
/* newgdisplay->disp_width,newgdisplay->disp_height,
newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset */
x1, y1, x2, y2
);

6
app/gimpimage-convert.c
View File

@ -2168,9 +2168,9 @@ update_box_rgb (Histogram histogram,
finished_axesscan:
/*
// boxp->Rhalferror = (Rmin+Rmax)/2;
// boxp->Ghalferror = (Gmin+Gmax)/2;
// boxp->Bhalferror = (Bmin+Bmax)/2;
boxp->Rhalferror = (Rmin+Rmax)/2;
boxp->Ghalferror = (Gmin+Gmax)/2;
boxp->Bhalferror = (Bmin+Bmax)/2;
*/
/*boxp->error = (sqrt((double)(boxp->error/ccount)));*/

6
app/gimpimage-duplicate.c
View File

@ -776,9 +776,9 @@ duplicate_projection (GimpImage *oldgimage, GimpImage *newgimage,
gimage_invalidate_without_render (gdisp->gimage, 0,0,
gdisp->gimage->width,
gdisp->gimage->height,
// 64,64,128,128);
// newgdisplay->disp_width,newgdisplay->disp_height,
// newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset
64,64,128,128);
/* newgdisplay->disp_width,newgdisplay->disp_height,
newgdisplay->disp_width+newgdisplay->disp_xoffset,newgdisplay->disp_height+newgdisplay->disp_yoffset */
x1, y1, x2, y2
);

2
app/tile_manager.c
View File

@ -255,7 +255,7 @@ tile_manager_validate (TileManager *tm,
/* DEBUG STUFF -> if (tm->user_data)
{
// fprintf(stderr,"V%p ",tm->user_data);
fprintf(stderr,"V%p ",tm->user_data);
fprintf(stderr,"V");
}
else

2
plug-ins/Lighting/lighting_ui.c
View File

@ -384,7 +384,7 @@ create_options_page (void)
GtkWidget *vbox;
GtkWidget *toggle;
GtkWidget *table;
// GtkWidget *spinbutton;
/*GtkWidget *spinbutton;*/
GtkObject *adj;
page = gtk_vbox_new (FALSE, 4);

2
plug-ins/common/jpeg.c
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/common/winclipboard.c
View File

@ -363,7 +363,7 @@ CB_CopyImage (gboolean interactive,
pData[x*3+y*nSizeLine] = pLine[x*drawable->bpp+2]; /* blue */
pData[x*3+y*nSizeLine+1] = pLine[x*drawable->bpp+1]; /* green */
pData[x*3+y*nSizeLine+2] = pLine[x*drawable->bpp]; /* red */
//pData[x+y*drawable->width*3+3] = 0; /* reserved */
/*pData[x+y*drawable->width*3+3] = 0;*/ /* reserved */
}
}
}

2
plug-ins/jpeg/jpeg-load.c
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/jpeg/jpeg-load.h
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/jpeg/jpeg-save.c
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/jpeg/jpeg-save.h
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/jpeg/jpeg.c
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/jpeg/jpeg.h
View File

@ -1833,7 +1833,7 @@ save_dialog (void)
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_widget_set_usize (text, -1, 3); /* //HB: restrict to 3 line height
gtk_widget_set_usize (text, -1, 3); /* HB: restrict to 3 line height
* to allow 800x600 mode */
if (image_comment)
gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, image_comment, -1);

2
plug-ins/sel2path/spline.c
View File

@ -91,7 +91,7 @@ evaluate_spline (spline_type s, real t)
real_coordinate_type t2 = Pmult_scalar (V[j - 1].v[i + 1], t);
V[j].v[i] = Padd (t1, t2);
#else
/* //HB: the above is really nice, but is there any other compiler
/* HB: the above is really nice, but is there any other compiler
* supporting this ??
*/
real_coordinate_type t1;

2
plug-ins/twain/tw_func.h
View File

@ -232,4 +232,4 @@ void registerWindowHandle(pTW_SESSION, HWND);
void registerTransferCallbacks(pTW_SESSION, pTXFR_CB_FUNCS, void *);
void setClientData(pTW_SESSION session, void *clientData);
#endif // _TW_FUNC_H
#endif /* _TW_FUNC_H */

2
plug-ins/twain/tw_util.h
View File

@ -68,4 +68,4 @@ void logBegin(pTW_IMAGEINFO, void *);
void logData(pTW_IMAGEINFO, pTW_IMAGEMEMXFER, void *);
#endif
#endif // __TW_UTIL_H
#endif /* __TW_UTIL_H */

22
plug-ins/twain/twain.h
View File

@ -53,12 +53,12 @@
/* Force 32-bit twain to use same packing of twain structures as existing */
/* 16-bit twain. This allows 16/32-bit thunking. */
#ifdef WIN32
#ifdef __BORLANDC__ //(Mentor June 13, 1996) if using a Borland compiler
#pragma option -a2 //(Mentor June 13, 1996) switch to word alignment
#else //(Mentor June 13, 1996) if we're using some other compiler
#ifdef __BORLANDC__ /* (Mentor June 13, 1996) if using a Borland compiler */
#pragma option -a2 /*(Mentor June 13, 1996) switch to word alignment*/
#else /*(Mentor June 13, 1996) if we're using some other compiler*/
#pragma pack (push, before_twain)
#pragma pack (2)
#endif //(Mentor June 13, 1996)
#endif /*(Mentor June 13, 1996)*/
#else /* WIN32 */
#endif /* WIN32 */
@ -384,7 +384,7 @@ typedef struct
TW_INT16 dataArgType; /* DSM_Entry dataArgType parameter */
TW_INT16 message; /* DSM_Entry message parameter */
TW_INT32 pDataSize; /* Size of pData (0 if NULL) */
// TW_MEMREF pData; /* Based on implementation specifics, a */
/* TW_MEMREF pData; Based on implementation specifics, a */
/* pData parameter makes no sense in this */
/* structure, but data (if provided) will be*/
/* appended in the data block. */
@ -397,7 +397,7 @@ typedef struct
TW_UINT16 returnCode; /* Thunker DsEntry return code. */
TW_UINT16 conditionCode; /* Thunker DsEntry condition code. */
TW_INT32 pDataSize; /* Size of pData (0 if NULL) */
// TW_MEMREF pData; /* Based on implementation specifics, a */
/* TW_MEMREF pData; Based on implementation specifics, a */
/* pData parameter makes no sense in this */
/* structure, but data (if provided) will be*/
/* appended in the data block. */
@ -661,7 +661,7 @@ typedef struct {
#define TWSS_A5 5
#define TWSS_B4 6
#define TWSS_B6 7
//#define TWSS_B 8
/*#define TWSS_B 8 */
/* Added 1.7 */
#define TWSS_USLEDGER 9
#define TWSS_USEXECUTIVE 10
@ -1808,11 +1808,11 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY,
/* Force 32-bit twain to use same packing of twain structures as existing */
/* 16-bit twain. This allows 16/32-bit thunking. */
#ifdef WIN32
#ifdef __BORLANDC__ //(Mentor June 13, 1996) if we're using a Borland compiler
#pragma option -a. //(Mentor October 30, 1996) switch back to original alignment
#else //(Mentor June 13, 1996) if NOT using a Borland compiler
#ifdef __BORLANDC__ /*(Mentor June 13, 1996) if we're using a Borland compiler */
#pragma option -a. /*(Mentor October 30, 1996) switch back to original alignment */
#else /*(Mentor June 13, 1996) if NOT using a Borland compiler */
#pragma pack (pop, before_twain)
#endif //(Mentor June 13, 1996)
#endif /*(Mentor June 13, 1996) */
#else /* WIN32 */
#endif /* WIN32 */

2
plug-ins/winsnap/winsnap.c
View File

@ -1249,7 +1249,7 @@ sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect)
gimp_pixel_rgn_set_rect(&pixel_rgn, (guchar *) capBytes,
0, 0, ROUND4(width), height);
/* //HB: update data BEFORE size change */
/* HB: update data BEFORE size change */
gimp_drawable_flush(drawable);
/* Now resize the layer down to the correct size if necessary. */
if (width != ROUND4(width)) {