From 3cbef1a976731bb3a714ee13cbd1813ed142ae5e Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 11 Sep 2012 22:50:11 +0300 Subject: Use C-style comments in rfbconfig.h.cmake and C source code. Using C++-style comments when building the code with -ansi does not work, so be more conservative with the comment style. --- test/bmp.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/bmp.h b/test/bmp.h index 055b1ee..9d1c263 100644 --- a/test/bmp.h +++ b/test/bmp.h @@ -13,8 +13,8 @@ * wxWindows Library License for more details. */ -// This provides rudimentary facilities for loading and saving true color -// BMP and PPM files +/* This provides rudimentary facilities for loading and saving true color */ +/* BMP and PPM files */ #ifndef __BMP_H__ #define __BMP_H__ @@ -26,16 +26,20 @@ enum BMPPIXELFORMAT {BMP_RGB=0, BMP_RGBX, BMP_BGR, BMP_BGRX, BMP_XBGR, BMP_XRGB} extern "C" { #endif -// This will load a Windows bitmap from a file and return a buffer with the -// specified pixel format, scanline alignment, and orientation. The width and -// height are returned in w and h. +/* + * This will load a Windows bitmap from a file and return a buffer with the + * specified pixel format, scanline alignment, and orientation. The width and + * height are returned in w and h. + */ int loadbmp(char *filename, unsigned char **buf, int *w, int *h, enum BMPPIXELFORMAT f, int align, int dstbottomup); -// This will save a buffer with the specified pixel format, pitch, orientation, -// width, and height as a 24-bit Windows bitmap or PPM (the filename determines -// which format to use) +/* + * This will save a buffer with the specified pixel format, pitch, orientation, + * width, and height as a 24-bit Windows bitmap or PPM (the filename determines + * which format to use) + */ int savebmp(char *filename, unsigned char *buf, int w, int h, enum BMPPIXELFORMAT f, int srcpitch, int srcbottomup); -- cgit v1.1