Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
Makefile.am exhibit_file.h exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_thumb.c
Log Message:
* Warnings--
* Fix a segv
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 14 Dec 2005 11:33:30 -0000 1.1
+++ Makefile.am 23 Dec 2005 09:46:14 -0000 1.2
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
+-Wall -g \
-I/usr/local/include \
-I$(top_srcdir)/lib \
@my_includes@
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_file.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_file.h 15 Dec 2005 10:07:14 -0000 1.2
+++ exhibit_file.h 23 Dec 2005 09:46:14 -0000 1.3
@@ -1,6 +1,7 @@
#ifndef _EX_FILE_H
#define _EX_FILE_H
+int _ex_file_is_ebg(char *file);
int _ex_file_is_viewable(char *file);
char *_ex_file_strip_extention(char *path);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_image.c 23 Dec 2005 08:59:27 -0000 1.13
+++ exhibit_image.c 23 Dec 2005 09:46:14 -0000 1.14
@@ -184,7 +184,7 @@
_ex_image_flip_diagonal(Etk_Image *im, int direction)
{
unsigned int *data, *data2, *to, *from;
- int x, y, w, hw, tmp, iw, ih;
+ int x, y, w, hw, iw, ih;
if(im->use_edje)
return;
@@ -247,7 +247,7 @@
int a, r, g, b;
int *as, *rs, *gs, *bs;
int rad = 2; /* maybe make this configurable later */
- unsigned int *p1, *p2, *tmp;
+ unsigned int *p1, *p2;
if(im->use_edje)
return;
@@ -346,9 +346,8 @@
int w, h;
int x, y;
int a, r, g, b;
- int *as, *rs, *gs, *bs;
int rad = 2; /* maybe make this configurable later */
- unsigned int *p1, *p2, *tmp;
+ unsigned int *p1, *p2;
if(im->use_edje)
return;
@@ -435,10 +434,7 @@
void
_ex_image_zoom(Etk_Image *im, int zoom)
{
- unsigned int *data;
int w, h;
- int x, y;
- unsigned int *p1, *p2, *tmp;
if(im->use_edje)
return;
@@ -464,9 +460,8 @@
{
DATA32 *data, *p;
int w, h;
- int i, j, x, y;
+ int i, j;
int val2;
- DATA8 a, r, g, b;
DATA8 red_mapping[256];
DATA8 green_mapping[256];
DATA8 blue_mapping[256];
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_image.h 14 Dec 2005 23:27:12 -0000 1.3
+++ exhibit_image.h 23 Dec 2005 09:46:14 -0000 1.4
@@ -12,5 +12,6 @@
void _ex_image_save(Etk_Image *im);
void _ex_image_zoom(Etk_Image *im, int zoom);
void _ex_image_brightness(Etk_Image *im, int brightness);
-
+void _ex_image_wallpaper_set(Etk_Image *im);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- exhibit_main.c 23 Dec 2005 08:59:27 -0000 1.20
+++ exhibit_main.c 23 Dec 2005 09:46:14 -0000 1.21
@@ -1,5 +1,6 @@
#include "exhibit.h"
#include <Ecore_File.h>
+#include "exhibit_file.h"
extern pid_t pid;
extern Evas_List *thumb_list;
@@ -122,10 +123,11 @@
{
Exhibit *e;
+ e = data;
+
if (e->fit_window)
return;
- e = data;
etk_widget_size_request_set(e->alignment, 10, 10);
etk_paned_add2(ETK_PANED(e->hpaned), e->alignment, TRUE);
etk_widget_size_request_set(e->image, -1, -1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_menus.c 23 Dec 2005 07:44:17 -0000 1.10
+++ exhibit_menus.c 23 Dec 2005 09:46:14 -0000 1.11
@@ -1,5 +1,6 @@
#include "exhibit.h"
#include "exhibit_main.h"
+#include "exhibit_image.h"
#define EX_MENU_ITEM_GET_RETURN(o) \
Etk_Menu_Item *item; \
@@ -276,7 +277,7 @@
e = data;
r = etk_tree_selected_row_get(ETK_TREE(e->itree));
if(!r) return;
- _ex_image_wallpaper_set(e->image);
+ _ex_image_wallpaper_set(ETK_IMAGE(e->image));
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_thumb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_thumb.c 14 Dec 2005 11:33:30 -0000 1.1
+++ exhibit_thumb.c 23 Dec 2005 09:46:14 -0000 1.2
@@ -1,4 +1,5 @@
#include "exhibit.h"
+#include "exhibit_file.h"
pid_t pid = -1;
Evas_List *thumb_list;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
