Changeset 291 for libcaca/trunk/examples/cacaview.cTweet

Timestamp:

Dec 31, 2003, 1:05:44 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/caca.c: + Do not try the X11 driver if DISPLAY is set to the empty string.
• examples/cacaview.c: + Cosmetic fixes.

File:

• libcaca/trunk/examples/cacaview.c (modified) (5 diffs)

libcaca/trunk/examples/cacaview.c

@@ -1 +1 @@
 /*
- *  view          image viewer for libcaca
+ *  cacaview      image viewer for libcaca
  *  Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
@@ -61 +61 @@
 int x, y;
 unsigned int w, h, depth, bpp, rmask, gmask, bmask, amask;
+#if !defined(HAVE_IMLIB2_H)
 unsigned int red[256], green[256], blue[256], alpha[256];
+#endif
 
 int main(int argc, char **argv)
@@ -288 +290 @@
             newbitmap = caca_create_bitmap(bpp, 2 * xn, 2 * yn, depth * w,
                                            rmask, gmask, bmask, amask);
+#if !defined(HAVE_IMLIB2_H)
             if(bpp == 8)
                 caca_set_bitmap_palette(newbitmap, red, green, blue, alpha);
+#endif
             draw_checkers(0, fullscreen ? 0 : 1,
                           ww - 1, fullscreen ? wh - 1 : wh - 3);
@@ -369 +373 @@
 static void unload_image(void)
 {
-#ifdef HAVE_IMLIB2_H
+#if defined(HAVE_IMLIB2_H)
     if(image)
         imlib_free_image();
@@ -386 +390 @@
 static void load_image(const char *name)
 {
-#ifdef HAVE_IMLIB2_H
+#if defined(HAVE_IMLIB2_H)
     /* Load the new image */
     image = imlib_load_image(name);