Changeset 442 for pwntcha/trunkTweet

Timestamp:

Jan 10, 2005, 1:33:40 AM (16 years ago)

Author:

Sam Hocevar

Message:

• oops, forgot to commit #ifdef fixes.

File:

• pwntcha/trunk/src/image.c (modified) (9 diffs)

pwntcha/trunk/src/image.c

@@ -16 +16 @@
 #include "common.h"
 
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#   error "DevIL routines not implemented yet"
+#elif defined(HAVE_OLECTL_H)
 #   include <windows.h>
 #   include <ocidl.h>
 #   include <olectl.h>
-BOOL oleload(LPCTSTR name, LPPICTURE* pic);
+static BOOL oleload(LPCTSTR name, LPPICTURE* pic);
 struct priv
 {
@@ -40 +42 @@
 {
     struct image *img;
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
     struct priv *priv = malloc(sizeof(struct priv));
     LPPICTURE pic = NULL;
@@ -58 +61 @@
         return NULL;
 
-#if defined(WIN32)
+#if defined(HAVE_OLECTL_H)
     if(!oleload((LPCTSTR)name, &pic))
     {
@@ -119 +122 @@
 
     img = (struct image *)malloc(sizeof(struct image));
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
     img->width = width;
     img->height = height;
@@ -153 +157 @@
 {
     struct image *img;
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
     struct priv *priv = malloc(sizeof(struct priv));
     HDC dc;
@@ -183 +188 @@
 
     img = (struct image *)malloc(sizeof(struct image));
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
     dc = CreateCompatibleDC(NULL);
     if(GetDeviceCaps(dc, BITSPIXEL) < 24)
@@ -233 +239 @@
 void image_free(struct image *img)
 {
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
     struct priv *priv = img->priv;
     DeleteObject(priv->bitmap);
@@ -253 +260 @@
 void image_save(struct image *img, const char *name)
 {
-#if defined(WIN32)
+#if defined(HAVE_IL_H)
+#elif defined(HAVE_OLECTL_H)
 
 #elif defined(HAVE_SDL_IMAGE_H)
@@ -307 +315 @@
 }
 
-#if defined(WIN32)
-BOOL oleload(LPCTSTR name, LPPICTURE* pic)
+#if defined(HAVE_OLECTL_H)
+static BOOL oleload(LPCTSTR name, LPPICTURE* pic)
 {
     HRESULT ret;