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

Timestamp:

Jan 3, 2005, 10:48:54 PM (18 years ago)

Author:

Sam Hocevar

Message:

• use OpenCV rather than Imlib2 if both are available.
• cleaned up the slashdot code.
• decode phpBB captchas.
• added filter_contrast.

File:

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

pwntcha/trunk/src/image.c

@@ -16 +16 @@
 #include "common.h"
 
-#if defined(HAVE_IMLIB2_H)
-#   include <Imlib2.h>
-#elif defined(HAVE_CV_H)
+#if defined(HAVE_CV_H)
 #   include <cv.h>
 #   include <highgui.h>
+#elif defined(HAVE_IMLIB2_H)
+#   include <Imlib2.h>
 #else
 #   error "No imaging library"
 #endif
 
-struct image * image_load(char *name)
+struct image *image_load(char *name)
 {
-    struct image * img;
-#if defined(HAVE_IMLIB2_H)
+    struct image *img;
+#if defined(HAVE_CV_H)
+    IplImage *priv = cvLoadImage(name, -1);
+#elif defined(HAVE_IMLIB2_H)
     Imlib_Image priv = imlib_load_image(name);
-#elif defined(HAVE_CV_H)
-    IplImage * priv = cvLoadImage(name, -1);
 #endif
 
@@ -38 +38 @@
 
     img = malloc(sizeof(struct image));
-#if defined(HAVE_IMLIB2_H)
+#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;
+#elif defined(HAVE_IMLIB2_H)
     imlib_context_set_image(priv);
     img->width = imlib_image_get_width();
@@ -45 +51 @@
     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;
@@ -57 +57 @@
 }
 
-struct image * image_new(int width, int height)
+struct image *image_new(int width, int height)
 {
-    struct image * img;
-#if defined(HAVE_IMLIB2_H)
+    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);
-#elif defined(HAVE_CV_H)
-    IplImage * priv = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
 #endif
 
@@ -70 +70 @@
 
     img = malloc(sizeof(struct image));
-#if defined(HAVE_IMLIB2_H)
+#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;
+#elif defined(HAVE_IMLIB2_H)
     imlib_context_set_image(priv);
     img->width = imlib_image_get_width();
@@ -77 +83 @@
     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;
 
     return img;
+}
+
+void image_free(struct image *img)
+{
+#if 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
+
+    free(img);
 }
 
@@ -133 +147 @@
 void image_display(struct image *img)
 {
-#if defined(HAVE_IMLIB2_H)
+#if defined(HAVE_CV_H)
+    char name[BUFSIZ];
+    sprintf(name, "Image %p (%i x %i)", img, img->width, img->height);
+    cvNamedWindow(name, 0);
+    cvShowImage(name, img->priv);
+    cvResizeWindow(name, img->width * 2, img->height * 2 + 50);
+    while((unsigned char)cvWaitKey(0) != 0x1b)
+        ;
+#elif defined(HAVE_IMLIB2_H)
     //char name[BUFSIZ];
     //static int i = 0;
@@ -140 +162 @@
     //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);
-    cvNamedWindow(name, 0);
-    cvShowImage(name, img->priv);
-    cvResizeWindow(name, 320, 120);
 #endif
 }