Merge branch 'v3.12.4'

[libucw.git] / images / io-main.c

diff --git a/images/io-main.c b/images/io-main.c
index 3d02a9e5e8aecee0f0f27616f794666216f6ef24..c2975842c3e7076b2e4e8162250c865a39c4d660 100644 (file)
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -9,8 +9,8 @@
 
 #undef LOCAL_DEBUG
 
 
 #undef LOCAL_DEBUG
 

-#include "lib/lib.h"
-#include "lib/mempool.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"

 #include "images/images.h"
 #include "images/error.h"
 #include "images/io-main.h"
 #include "images/images.h"
 #include "images/error.h"
 #include "images/io-main.h"


@@ -52,7 +52,7 @@ libungif_failed:
 #endif
 #ifdef CONFIG_IMAGES_LIBPNG
   libpng_cleanup(io);
 #endif
 #ifdef CONFIG_IMAGES_LIBPNG
   libpng_cleanup(io);

-libpng_failed:  
+libpng_failed:

 #endif
 #ifdef CONFIG_IMAGES_LIBJPEG
   libjpeg_cleanup(io);
 #endif
 #ifdef CONFIG_IMAGES_LIBJPEG
   libjpeg_cleanup(io);