Changeset 407 for pwntcha/trunk/src/image.cTweet

Timestamp:

Jan 4, 2005, 11:30:52 AM (18 years ago)

Author:

Sam Hocevar

Message:

• src/image.c: SDL_image support.

File:

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

pwntcha/trunk/src/image.c

@@ -16 +16 @@
 #include "common.h"
 
-#if defined(HAVE_CV_H)
+#if defined(HAVE_SDL_IMAGE_H)
+#   include <SDL_image.h>
+#elif defined(HAVE_IMLIB2_H)
+#   include <Imlib2.h>
+#elif defined(HAVE_CV_H)
 #   include <cv.h>
 #   include <highgui.h>
-#elif defined(HAVE_IMLIB2_H)
-#   include <Imlib2.h>
 #else
 #   error "No imaging library"
@@ -28 +30 @@
 {
     struct image *img;
-#if defined(HAVE_CV_H)
+#if defined(HAVE_SDL_IMAGE_H)
+    SDL_Surface *priv = IMG_Load(name);
+#elif defined(HAVE_IMLIB2_H)
+    Imlib_Image priv = imlib_load_image(name);
+#elif defined(HAVE_CV_H)
     IplImage *priv = cvLoadImage(name, -1);
-#elif defined(HAVE_IMLIB2_H)
-    Imlib_Image priv = imlib_load_image(name);
 #endif
 
@@ -38 +42 @@
 
     img = malloc(sizeof(struct image));
-#if defined(HAVE_CV_H)
-    img->width = priv->width;
-    img->height = priv->height;
-    img->pitch = priv->widthStep;
-    img->channels = priv->nChannels;
-    img->pixels = priv->imageData;
+#if defined(HAVE_SDL_IMAGE_H)
+    img->width = priv->w;
+    img->height = priv->h;
+    img->pitch = priv->pitch;
+    img->channels = priv->format->BytesPerPixel;
+    img->pixels = priv->pixels;
 #elif defined(HAVE_IMLIB2_H)
     imlib_context_set_image(priv);
@@ -51 +55 @@
     img->channels = 4;
     img->pixels = (char *)imlib_image_get_data();
-#endif
-    img->priv = (void *)priv;
-
-    return img;
-}
-
-struct image *image_new(int width, int height)
-{
-    struct image *img;
-#if defined(HAVE_CV_H)
-    IplImage *priv = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
-#elif defined(HAVE_IMLIB2_H)
-    Imlib_Image priv = imlib_create_image(width, height);
-#endif
-
-    if(!priv)
-        return NULL;
-
-    img = malloc(sizeof(struct image));
-#if defined(HAVE_CV_H)
+#elif defined(HAVE_CV_H)
     img->width = priv->width;
     img->height = priv->height;
@@ -76 +61 @@
     img->channels = priv->nChannels;
     img->pixels = priv->imageData;
+#endif
+    img->priv = (void *)priv;
+
+    return img;
+}
+
+struct image *image_new(int width, int height)
+{
+    struct image *img;
+#if defined(HAVE_SDL_IMAGE_H)
+    SDL_Surface *priv;
+    Uint32 rmask, gmask, bmask, amask;
+#   if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    rmask = 0xff000000;
+    gmask = 0x00ff0000;
+    bmask = 0x0000ff00;
+    amask = 0x000000ff;
+#   else
+    rmask = 0x000000ff;
+    gmask = 0x0000ff00;
+    bmask = 0x00ff0000;
+    amask = 0xff000000;
+#   endif
+    priv = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32,
+                                rmask, gmask, bmask, amask);
+#elif defined(HAVE_IMLIB2_H)
+    Imlib_Image priv = imlib_create_image(width, height);
+#elif defined(HAVE_CV_H)
+    IplImage *priv = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
+#endif
+
+    if(!priv)
+        return NULL;
+
+    img = malloc(sizeof(struct image));
+#if defined(HAVE_SDL_IMAGE_H)
+    img->width = priv->w;
+    img->height = priv->h;
+    img->pitch = priv->pitch;
+    img->channels = priv->format->BytesPerPixel;
+    img->pixels = priv->pixels;
 #elif defined(HAVE_IMLIB2_H)
     imlib_context_set_image(priv);
@@ -83 +109 @@
     img->channels = 4;
     img->pixels = (char *)imlib_image_get_data();
+#elif defined(HAVE_CV_H)
+    img->width = priv->width;
+    img->height = priv->height;
+    img->pitch = priv->widthStep;
+    img->channels = priv->nChannels;
+    img->pixels = priv->imageData;
 #endif
     img->priv = (void *)priv;
@@ -91 +123 @@
 void image_free(struct image *img)
 {
-#if defined(HAVE_CV_H)
+#if defined(HAVE_SDL_IMAGE_H)
+    SDL_FreeSurface(img->priv);
+#elif defined(HAVE_IMLIB2_H)
+    imlib_context_set_image(img->priv);
+    imlib_free_image();
+#elif defined(HAVE_CV_H)
     IplImage *iplimg;
     iplimg = (IplImage *)img->priv;
     cvReleaseImage(&iplimg);
-#elif defined(HAVE_IMLIB2_H)
-    imlib_context_set_image(img->priv);
-    imlib_free_image();
 #endif
 
@@ -147 +181 @@
 void image_display(struct image *img)
 {
-#if defined(HAVE_CV_H)
+#if defined(HAVE_SDL_IMAGE_H)
+    //Nothing to do here
+#elif defined(HAVE_IMLIB2_H)
+    //char name[BUFSIZ];
+    //static int i = 0;
+    //sprintf(name, "image%i-%ix%i.png", i++, img->width, img->height);
+    //imlib_context_set_image(img->priv);
+    //imlib_save_image(name);
+    //fprintf(stderr, "saved to %s\n", name);
+#elif defined(HAVE_CV_H)
     char name[BUFSIZ];
     sprintf(name, "Image %p (%i x %i)", img, img->width, img->height);
@@ -155 +198 @@
     while((unsigned char)cvWaitKey(0) != 0x1b)
         ;
-#elif defined(HAVE_IMLIB2_H)
-    //char name[BUFSIZ];
-    //static int i = 0;
-    //sprintf(name, "image%i-%ix%i.png", i++, img->width, img->height);
-    //imlib_context_set_image(img->priv);
-    //imlib_save_image(name);
-    //fprintf(stderr, "saved to %s\n", name);
-#endif
-}
-
+#endif
+}
+