gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

MinGW cleanup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10640 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-08-02 14:51:41 +00:00
parent 618517baba
commit a77949a8e6
5 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2001-08-02 Adam Fedor <fedor@gnu.org>
* Headers/gnustep/gui/NSApplication.h: Remove duplicate
NSOpenStepRoorDirectory decl.
* Headers/gnustep/gui/nsimage-tiff.h: Use TIFF defined types
for variables.
* Source/tiff.m: Likewise.
* Model/GNUmakefile: Add -lobjc to ...LIBRARIES_DEPEND.
* Tools/example.m: Don't use certain signals and fork on MINGW.
2001-08-01 Fred Kiefer <FredKiefer@gmx.de> 2001-08-01 Fred Kiefer <FredKiefer@gmx.de>
* Headers/gnustep/gui/NSEvent.h * Headers/gnustep/gui/NSEvent.h

3
Headers/gnustep/gui/NSApplication.h
View file

@ -368,9 +368,6 @@ NSUnRegisterServicesProvider(NSString *name);
APPKIT_EXPORT int APPKIT_EXPORT int
NSApplicationMain(int argc, const char **argv); NSApplicationMain(int argc, const char **argv);
APPKIT_EXPORT NSString*
NSOpenStepRootDirectory(void);
APPKIT_EXPORT void APPKIT_EXPORT void
NSShowSystemInfoPanel(NSDictionary *options); NSShowSystemInfoPanel(NSDictionary *options);

28
Headers/gnustep/gui/nsimage-tiff.h
View file

@ -39,16 +39,16 @@
/* Structure to store common information about a tiff. */ /* Structure to store common information about a tiff. */
typedef struct { typedef struct {
u_long imageNumber; uint32 imageNumber;
u_long subfileType; uint32 subfileType;
u_long width; uint32 width;
u_long height; uint32 height;
u_short bitsPerSample; /* number of bits per data channel */ uint16 bitsPerSample; /* number of bits per data channel */
u_short samplesPerPixel; /* number of channels per pixel */ uint16 samplesPerPixel; /* number of channels per pixel */
u_short planarConfig; /* meshed or separate */ uint16 planarConfig; /* meshed or separate */
u_short photoInterp; /* photometric interpretation of bitmap data, */ uint16 photoInterp; /* photometric interpretation of bitmap data, */
u_short compression; uint16 compression;
u_short extraSamples; /* Alpha */ uint16 extraSamples; /* Alpha */
int assocAlpha; int assocAlpha;
int quality; /* compression quality (for jpeg) 1 to 255 */ int quality; /* compression quality (for jpeg) 1 to 255 */
int numImages; /* number of images in tiff */ int numImages; /* number of images in tiff */
@ -56,10 +56,10 @@ typedef struct {
} NSTiffInfo; } NSTiffInfo;
typedef struct { typedef struct {
u_int size; uint32 size;
u_short *red; uint16 *red;
u_short *green; uint16 *green;
u_short *blue; uint16 *blue;
} NSTiffColormap; } NSTiffColormap;
typedef char* realloc_data_callback(char* data, long size); typedef char* realloc_data_callback(char* data, long size);

12
Source/tiff.m
View file

@ -259,7 +259,7 @@ NSTiffInfo *
NSTiffGetInfo(int imageNumber, TIFF* image) NSTiffGetInfo(int imageNumber, TIFF* image)
{ {
NSTiffInfo* info; NSTiffInfo* info;
u_short *sample_info = NULL; uint16 *sample_info = NULL;
if (image == NULL) if (image == NULL)
return NULL; return NULL;
@ -337,9 +337,9 @@ NSTiffRead(TIFF* image, NSTiffInfo* info, char* data)
int row, col; int row, col;
int maxval; int maxval;
int error = 0; int error = 0;
u_char* outP; uint8* outP;
u_char* buf; uint8* buf;
u_char* raster; uint8* raster;
NSTiffColormap* map; NSTiffColormap* map;
int scan_line_size; int scan_line_size;
@ -358,7 +358,7 @@ NSTiffRead(TIFF* image, NSTiffInfo* info, char* data)
scan_line_size = TIFFScanlineSize(image); scan_line_size = TIFFScanlineSize(image);
buf = _TIFFmalloc(scan_line_size); buf = _TIFFmalloc(scan_line_size);
raster = (u_char *)data; raster = (uint8 *)data;
outP = raster; outP = raster;
switch (info->photoInterp) switch (info->photoInterp)
{ {
@ -388,7 +388,7 @@ NSTiffRead(TIFF* image, NSTiffInfo* info, char* data)
{ {
for (row = 0; row < info->height; ++row) for (row = 0; row < info->height; ++row)
{ {
u_char *inP; uint8 *inP;
READ_SCANLINE(0); READ_SCANLINE(0);
inP = buf; inP = buf;
for (col = 0; col < info->width; col++) for (col = 0; col < info->width; col++)

4
Tools/example.m
View file

@ -188,10 +188,12 @@ init(int argc, char** argv)
{ {
signal(sym, ihandler); signal(sym, ihandler);
} }
#ifndef __MINGW__
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
signal(SIGTTOU, SIG_IGN); signal(SIGTTOU, SIG_IGN);
signal(SIGTTIN, SIG_IGN); signal(SIGTTIN, SIG_IGN);
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
#endif
signal(SIGTERM, ihandler); signal(SIGTERM, ihandler);
if (debug == 0) if (debug == 0)
@ -199,6 +201,7 @@ init(int argc, char** argv)
/* /*
* Now fork off child process to run in background. * Now fork off child process to run in background.
*/ */
#ifndef __MINGW__
switch (fork()) switch (fork())
{ {
case -1: case -1:
@ -223,6 +226,7 @@ init(int argc, char** argv)
} }
exit(0); exit(0);
} }
#endif
} }
} }