Skip to content
Browse files

Slightly refactored flipping

  • Loading branch information...
1 parent ba0a5b8 commit 4c40cc24bc6b3e11fc9e6cf337ddb035fa750eb3 @muennich committed May 6, 2012
Showing with 19 additions and 28 deletions.
  1. +1 −1 Makefile
  2. +5 −9 commands.c
  3. +11 −14 image.c
  4. +1 −3 image.h
  5. +1 −1 types.h
View
2 Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20120418
+VERSION = git-20120506
CC = gcc
CFLAGS = -ansi -Wall -pedantic -O2
View
14 commands.c
@@ -343,18 +343,14 @@ bool i_rotate(arg_t a) {
}
bool i_flip(arg_t a) {
- flip_t flp = (flip_t) a;
+ flipdir_t dir = (flipdir_t) a;
if (mode == MODE_IMAGE) {
- if (flp == FLIP_HORIZONTAL) {
- img_flip_horizontal(&img);
- return true;
- } else if (flp == FLIP_VERTICAL) {
- img_flip_vertical(&img);
- return true;
- }
+ img_flip(&img, dir);
+ return true;
+ } else {
+ return false;
}
- return false;
}
bool i_toggle_antialias(arg_t a) {
View
25 image.c
@@ -642,24 +642,21 @@ void img_rotate_right(img_t *img) {
img_rotate(img, 1);
}
-void img_flip(img_t *img, int f) {
- if (img == NULL || img->im == NULL || img->win == NULL)
+void img_flip(img_t *img, flipdir_t d) {
+ if (img == NULL || img->im == NULL)
return;
imlib_context_set_image(img->im);
- if (f == 0)
- imlib_image_flip_horizontal();
- else
- imlib_image_flip_vertical();
- img->dirty = true;
-}
-
-void img_flip_horizontal(img_t *img) {
- img_flip(img, 0);
-}
-void img_flip_vertical(img_t *img) {
- img_flip(img, 1);
+ switch (d) {
+ case FLIP_HORIZONTAL:
+ imlib_image_flip_horizontal();
+ break;
+ case FLIP_VERTICAL:
+ imlib_image_flip_vertical();
+ break;
+ }
+ img->dirty = true;
}
void img_toggle_antialias(img_t *img) {
View
4 image.h
@@ -80,9 +80,7 @@ void img_rotate(img_t*, int);
void img_rotate_left(img_t*);
void img_rotate_right(img_t*);
-void img_flip(img_t*, int);
-void img_flip_horizontal(img_t*);
-void img_flip_vertical(img_t*);
+void img_flip(img_t*, flipdir_t);
void img_toggle_antialias(img_t*);
View
2 types.h
@@ -26,7 +26,7 @@ typedef enum {
typedef enum {
FLIP_HORIZONTAL,
FLIP_VERTICAL
-} flip_t;
+} flipdir_t;
typedef enum {
SCALE_DOWN,

0 comments on commit 4c40cc2

Please sign in to comment.
Something went wrong with that request. Please try again.