E CVS: libs/evas devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_main.c
Log Message:
Be a little more paranoid about freeing image data by adding some missing
checks for valid im->cs.data and im->image->data before trying to compare
them.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- evas_image_main.c 17 Dec 2006 15:48:50 - 1.40
+++ evas_image_main.c 19 Dec 2006 23:51:44 - 1.41
@@ -267,10 +267,18 @@
{
im->ref--;
if (im->ref > 0) return;
- if (im->cs.data != im->image->data)
+ if ((im->cs.data) && (im->image->data))
+ {
+ if (im->cs.data != im->image->data)
+ {
+if (!im->cs.no_free) free(im->cs.data);
+ }
+ }
+ else if (im->cs.data)
{
if (!im->cs.no_free) free(im->cs.data);
}
+
im->cs.data = NULL;
evas_common_pipe_free(im);
if (im->image) evas_common_image_surface_free(im->image);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_filechooser_widget.c
Log Message:
--warnings
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_engine.c8 Oct 2006 10:04:54 - 1.14
+++ etk_engine.c19 Dec 2006 22:01:57 - 1.15
@@ -171,7 +171,7 @@
handle = dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
if (!handle)
{
- char *error;
+ const char *error;
error = dlerror();
ETK_WARNING("Etk can not dlopen the requested engine: %s", error ? error
: "Unknown error");
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_filechooser_widget.c19 Dec 2006 21:52:03 - 1.15
+++ etk_filechooser_widget.c19 Dec 2006 22:01:57 - 1.16
@@ -244,7 +244,7 @@
if (!filechooser_widget && !(filechooser_widget->files_tree))
return NULL;
- if (row =
etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree)))
+ if ((row =
etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree
etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL,
NULL, &filename, NULL);
return filename;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/tools/etk_prefs
Modified Files:
etk_prefs.c
Log Message:
--warnings
===
RCS file: /cvs/e/e17/proto/etk/src/tools/etk_prefs/etk_prefs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_prefs.c 6 Oct 2006 17:04:15 - 1.4
+++ etk_prefs.c 19 Dec 2006 22:01:57 - 1.5
@@ -9,7 +9,6 @@
void etk_prefs_standard_item_add(Etk_Widget *tree, char *icon, char *label,
void (*func) (void));
static void _etk_prefs_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
-static void _etk_prefs_destroy(void *data);
static Etk_Widget *_etk_prefs_theme_tab_create();
static void _etk_prefs_theme_row_selected_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
static Etk_Widget *_etk_prefs_theme_preview_get(const char *theme);
@@ -113,12 +112,6 @@
if (num)
etk_notebook_current_page_set(ETK_NOTEBOOK(data), *num);
-}
-
-static void _etk_prefs_destroy(void *data)
-{
- etk_object_destroy(ETK_OBJECT(data));
- etk_main_quit();
}
static Etk_Widget *_etk_prefs_theme_tab_create()
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_filechooser_widget.c
Log Message:
[Etk_Filechooser_Widget] Patch from Dave (DaveMDS <[EMAIL PROTECTED]>) to fix
invalid return if no file has been selected
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_filechooser_widget.c20 Oct 2006 17:51:44 - 1.14
+++ etk_filechooser_widget.c19 Dec 2006 21:52:03 - 1.15
@@ -238,14 +238,14 @@
*/
const char *etk_filechooser_widget_selected_file_get(Etk_Filechooser_Widget
*filechooser_widget)
{
- const char *filename;
+ const char *filename = NULL;
Etk_Tree_Row *row;
if (!filechooser_widget && !(filechooser_widget->files_tree))
return NULL;
- row = etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree));
- etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL,
NULL, &filename, NULL);
+ if (row =
etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree)))
+ etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL,
NULL, &filename, NULL);
return filename;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_spinner.c Log Message: [Etk_Spinner] Make sure we update the spinners value from the text when we hit the up / down arrow. This solves a bug when entering the value using the keyboard then trying to use the arrows. === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_spinner.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etk_spinner.c 19 Dec 2006 21:40:24 - 1.2 +++ etk_spinner.c 19 Dec 2006 21:43:50 - 1.3 @@ -606,6 +606,8 @@ if (!(spinner = ETK_SPINNER(data))) return 1; + + _etk_spinner_update_value_from_text(spinner); range = ETK_RANGE(spinner); etk_range_value_set(range, range->value - range->step_increment); @@ -624,6 +626,8 @@ if (!(spinner = ETK_SPINNER(data))) return 1; + + _etk_spinner_update_value_from_text(spinner); range = ETK_RANGE(spinner); etk_range_value_set(range, range->value + range->step_increment); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_spinner.c Log Message: [Etk_Spinner] The scanf family of functions doesnt accept %.Xf, only %f works - cant set precision === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_spinner.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_spinner.c 28 Nov 2006 21:40:07 - 1.1 +++ etk_spinner.c 19 Dec 2006 21:40:24 - 1.2 @@ -662,7 +662,7 @@ return; text = etk_editable_text_get(spinner->editable_object); - if (sscanf(text, spinner->value_format, &value) != 1) + if (sscanf(text, "%f", &value) != 1) value = 0.0; etk_range_value_set(ETK_RANGE(spinner), value); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_generic
Modified Files:
evas_engine.c
Log Message:
fix buffer canvas resizes :)
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_generic/evas_engine.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_engine.c 19 Dec 2006 14:12:40 - 1.15
+++ evas_engine.c 19 Dec 2006 15:06:33 - 1.16
@@ -491,6 +491,7 @@
RGBA_Image *im;
im = evas_common_image_new();
+ if (!im) return NULL;
im->image = evas_common_image_surface_new(im);
if (!im->image)
{
@@ -586,6 +587,7 @@
if (im_old)
{
im->cs.space = im_old->cs.space;
+ im->flags = im_old->flags;
/*
evas_common_load_image_data_from_file(im_old);
evas_common_image_colorspace_normalize(im);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: ecore_evas_buffer.c Log Message: explicitly enable alpha for buffer canvas image obj === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_buffer.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ecore_evas_buffer.c 15 Oct 2006 13:43:08 - 1.14 +++ ecore_evas_buffer.c 19 Dec 2006 15:06:23 - 1.15 @@ -573,6 +573,7 @@ evas_object_image_size_set(o, ee->w, ee->h); evas_object_image_alpha_set(o, 1); ee->engine.buffer.pixels = evas_object_image_data_get(o, 1); + evas_object_image_data_set(o, ee->engine.buffer.pixels); evas_object_event_callback_add(ee->engine.buffer.image, EVAS_CALLBACK_MOUSE_IN, _ecore_evas_buffer_cb_mouse_in, ee); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine_vo_out.c
Log Message:
use the new colorspace support in evas... :)
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- emotion_xine.c 12 Mar 2006 09:56:13 - 1.29
+++ emotion_xine.c 19 Dec 2006 14:15:17 - 1.30
@@ -239,7 +239,7 @@
ev->video = xine_open_video_driver(ev->decoder, "emotion",
XINE_VISUAL_TYPE_NONE, ev);
printf("RESULT: xine_open_video_driver() = %p\n", ev->video);
- //Let xine autodetect the best audio output driver
+ // Let xine autodetect the best audio output driver
ev->audio = xine_open_audio_driver(ev->decoder, NULL, ev);
// ev->audio = xine_open_audio_driver(ev->decoder, "oss", ev);
// dont use alsa - alsa has oss emulation.
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine_vo_out.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_xine_vo_out.c 4 Feb 2006 13:43:13 - 1.2
+++ emotion_xine_vo_out.c 19 Dec 2006 14:15:17 - 1.3
@@ -440,7 +440,7 @@
{
void *buf;
int ret;
-
+
if (fr->format == XINE_IMGFMT_YUY2)
{
_emotion_yuy2_to_bgra32(fr->width, fr->height,
fr->vo_frame.base[0], fr->frame.bgra_data);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
use the new colorspace support in evas... :)
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- emotion_smart.c 6 Sep 2006 07:12:24 - 1.22
+++ emotion_smart.c 19 Dec 2006 14:15:17 - 1.23
@@ -35,7 +35,7 @@
Emotion_Video_Module *module;
void *video;
- char *module_name;
+ char *module_name;
char *file;
Evas_Object *obj;
@@ -51,12 +51,12 @@
char *title;
struct {
- char *info;
- double stat;
+ char *info;
+ double stat;
} progress;
struct {
char *file;
- int num;
+ int num;
} ref;
struct {
int button_num;
@@ -992,53 +992,99 @@
int iw, ih, w, h;
Smart_Data *sd;
Emotion_Format format;
-
+ unsigned char *bgra_data;
+
sd = data;
evas_object_image_size_get(obj, &iw, &ih);
sd->module->video_data_size_get(sd->video, &w, &h);
if ((w != iw) || (h != ih))
{
- evas_object_image_size_set(obj, w, h);
- iw = w;
- ih = h;
+ evas_object_image_colorspace_set(obj, EVAS_COLORSPACE_YCBCR422P601_PL);
+evas_object_image_alpha_set(obj, 0);
+ evas_object_image_size_set(obj, w, h);
+ iw = w;
+ ih = h;
+ }
+ if ((iw < 1) || (ih < 1))
+ {
+ evas_object_image_pixels_dirty_set(obj, 0);
+ }
+ else
+ {
+ format = sd->module->format_get(sd->video);
+ if ((format == EMOTION_FORMAT_YV12) || (format == EMOTION_FORMAT_I420))
+ {
+unsigned char **rows;
+
+evas_object_image_colorspace_set(obj,
EVAS_COLORSPACE_YCBCR422P601_PL);
+rows = evas_object_image_data_get(obj, 1);
+if (rows)
+ {
+ if (sd->module->yuv_rows_get(sd->video, iw, ih,
+ rows,
+ &rows[ih],
+ &rows[ih + (ih / 2)]))
+ evas_object_image_data_update_add(obj, 0, 0, iw, ih);
+ }
+evas_object_image_data_set(obj, rows);
+evas_object_image_pixels_dirty_set(obj, 0);
+ }
+ else if (format == EMOTION_FORMAT_BGRA)
+ {
+if (sd->module->bgra_data_get(sd->video, &bgra_data));
+ {
+ evas_object_image_data_set(obj, bgra_data);
+ evas_object_image_pixels_dirty_set(obj, 0);
+ }
+ }
+ }
+// sd->module->frame_done(sd->video);
+/*
+ evas_object_image_size_get(obj, &iw, &ih);
+ sd->module->video_data_size_get(sd->video, &w, &h);
+ if ((w != iw) || (h != ih))
+ {
+ evas_object_image_size_set(obj, w, h);
+ iw = w;
+ ih = h;
}
format = sd->module->format_get(sd->video);
if ((format == EMOTION_FORMAT_YV12) || (format == EMOTION_FORMAT_I420))
{
- unsigned char **rows;
- Evas_Pixel_Import_Source ps;
-
- ps.format = EVAS_PIXEL_FORMAT_YUV420P_601;
- ps.w = iw;
- ps.h = ih;
-
- ps.rows = malloc(ps.h * 2 * sizeof(void *));
- if (!ps.rows)
- {
- sd->module->frame_done(sd->video);
- return;
- }
-
- rows = (unsigned char **)ps.rows;
-
- if (sd->module->yuv_rows_get(sd->video, iw, ih,
- rows,
-&rows[ps.h],
-&rows[ps.h + (ps.h / 2)]))
+ unsigned char **rows;
+ Evas_Pixel_Import_Source ps;
+
+ ps.format = EVAS_PIXEL_FORMAT_YUV420P_601;
+ ps.w = iw;
+ ps.h = ih;
+
+ ps.rows = malloc(ps.h * 2 * sizeof(void *));
+ if (!ps.rows)
+ {
+sd->module->frame_done(sd->video);
+return;
+ }
+
+ rows = (unsigned char **)ps.rows;
+
+ if (sd->module->yuv_rows_get(sd->video, iw, ih,
+rows,
+&rows[ps.h],
+&rows[ps.h + (ps.h / 2)]))
evas_object_image_pixels_import(obj, &ps);
- evas_object_image_pixels_dirty_set(obj, 0);
- free(ps.rows);
- }
+ evas_object_image_pixels_dirty_set(obj, 0);
+ free(ps.rows);
+ }
else if (format == EMOTION_FORMAT_BGRA)
{
- unsigned char *bgra_data;
- if (sd->module->bgra_data_get(sd->video, &bgra_data));
- {
- evas_object_image_data_set(obj, bgra_data);
- }
+ if (sd->module->bgra_data_get(sd->video, &bgra_data));
+ {
+evas_object_image_data_set(obj, bgra_data);
+
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/gl_common
Modified Files:
evas_gl_common.h evas_gl_context.c evas_gl_image.c
evas_gl_texture.c
Log Message:
fix color modulation for gl surfaces. also fix segvs tat can happen. xrender
engine is behind now though. can't do yuv surfaces (yet)
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_gl_common.h18 Dec 2006 14:55:47 - 1.8
+++ evas_gl_common.h19 Dec 2006 14:12:40 - 1.9
@@ -188,7 +188,9 @@
void evas_gl_common_texture_update(Evas_GL_Texture *tex,
RGBA_Image *im, int smooth);
void evas_gl_common_texture_free(Evas_GL_Texture *tex);
void evas_gl_common_texture_mipmaps_build(Evas_GL_Texture *tex,
RGBA_Image *im, int smooth);
-
+Evas_GL_Texture *evas_gl_common_ycbcr601pl_texture_new(Evas_GL_Context *gc,
unsigned char **rows, int w, int h, int smooth);
+void evas_gl_common_ycbcr601pl_texture_update(Evas_GL_Texture
*tex, unsigned char **rows, int w, int h, int smooth);
+
Evas_GL_Image*evas_gl_common_image_load(Evas_GL_Context *gc, char *file,
char *key, Evas_Image_Load_Opts *lo);
Evas_GL_Image*evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int
w, int h, int *data, int alpha, int cspace);
Evas_GL_Image*evas_gl_common_image_new_from_copied_data(Evas_GL_Context
*gc, int w, int h, int *data, int alpha, int cspace);
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_context.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_context.c 18 Dec 2006 14:55:47 - 1.5
+++ evas_gl_context.c 19 Dec 2006 14:12:40 - 1.6
@@ -67,9 +67,9 @@
// if (strstr(ext, "GL_NV_texture_rectangle"))
gc->ext.nv_texture_rectangle = 1;
// if (strstr(ext, "GL_EXT_texture_rectangle"))
gc->ext.nv_texture_rectangle = 1;
if (strstr(ext, "GL_ARB_texture_non_power_of_two"))
gc->ext.arb_texture_non_power_of_two = 1;
-printf("GL EXT supported: GL_SGIS_generate_mipmap = %x\n",
gc->ext.sgis_generate_mipmap);
-printf("GL EXT supported: GL_NV_texture_rectangle = %x\n",
gc->ext.nv_texture_rectangle);
-printf("GL EXT supported: GL_ARB_texture_non_power_of_two = %x\n",
gc->ext.arb_texture_non_power_of_two);
+// printf("GL EXT supported: GL_SGIS_generate_mipmap = %x\n",
gc->ext.sgis_generate_mipmap);
+// printf("GL EXT supported: GL_NV_texture_rectangle = %x\n",
gc->ext.nv_texture_rectangle);
+// printf("GL EXT supported: GL_ARB_texture_non_power_of_two = %x\n",
gc->ext.arb_texture_non_power_of_two);
// this causes at least nvidia's drivers to go into pathological pain when
// changing textures a lot (doing video). so we wont do anything with this
// for now, but it does work.
@@ -78,7 +78,7 @@
}
else
{
-printf("GL EXT supported: No extensions!\n");
+// printf("GL EXT supported: No extensions!\n");
}
gc->ext.checked = 1;
}
@@ -330,12 +330,14 @@
}
if (gc->font_texture_rectangle)
{
+glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->font_texture);
}
else
{
+glActiveTexture(GL_TEXTURE0);
if (gc->ext.nv_texture_rectangle)
glDisable(GL_TEXTURE_RECTANGLE_NV);
glEnable(GL_TEXTURE_2D);
@@ -346,6 +348,7 @@
{
if (gc->texture->rectangle)
{
+glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->texture->texture);
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_image.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_gl_image.c 17 Dec 2006 15:48:51 - 1.4
+++ evas_gl_image.c 19 Dec 2006 14:12:40 - 1.5
@@ -246,11 +246,11 @@
case EVAS_COLORSPACE_YCBCR422P709_PL:
if ((im->tex) && (im->dirty))
{
-evas_gl_common_ycbcr601pl_texture_update(im->tex, im->cs.data,
im->im->image->w, im->im->image->h);
+evas_gl_common_ycbcr601pl_texture_update(im->tex, im->cs.data,
im->im->image->w, im->im->image->h, smooth);
im->dirty = 0;
}
if ((!im->tex) && (im->cs.data) && (*((unsigned char **)im->cs.data)))
- im->t
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/gl_x11
Modified Files:
evas_engine.c
Log Message:
fix color modulation for gl surfaces. also fix segvs tat can happen. xrender
engine is behind now though. can't do yuv surfaces (yet)
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_x11/evas_engine.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas_engine.c 17 Dec 2006 16:46:30 - 1.19
+++ evas_engine.c 19 Dec 2006 14:12:40 - 1.20
@@ -496,6 +496,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image) return NULL;
eng_window_use(re->win);
im = image;
/* FIXME: can move to gl_common */
@@ -546,6 +547,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image) return NULL;
im = image;
return im->im->info.comment;
}
@@ -568,6 +570,7 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image) return;
im = image;
/* FIXME: can move to gl_common */
if (im->cs.space == cspace) return;
@@ -651,6 +654,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ if (!image) return;
eng_window_use(re->win);
evas_gl_common_image_free(image);
}
@@ -661,6 +665,12 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ if (!image)
+ {
+ *w = 0;
+ *h = 0;
+ return;
+ }
if (w) *w = ((Evas_GL_Image *)image)->im->image->w;
if (h) *h = ((Evas_GL_Image *)image)->im->image->h;
}
@@ -672,8 +682,8 @@
Evas_GL_Image *im, *im_old;
re = (Render_Engine *)data;
- eng_window_use(re->win);
if (!image) return NULL;
+ eng_window_use(re->win);
im_old = image;
if ((im_old) && (im_old->im->image->w == w) && (im_old->im->image->h == h))
return image;
@@ -703,6 +713,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ if (!image) return NULL;
evas_gl_common_image_dirty(image);
return image;
}
@@ -714,6 +725,11 @@
Evas_GL_Image *im;
re = (Render_Engine *)data;
+ if (!image)
+ {
+ *image_data = NULL;
+ return NULL;
+ }
im = image;
eng_window_use(re->win);
evas_common_load_image_data_from_file(im->im);
@@ -759,6 +775,7 @@
Evas_GL_Image *im, *im2;
re = (Render_Engine *)data;
+ if (!image) return NULL;
im = image;
eng_window_use(re->win);
switch (im->cs.space)
@@ -803,6 +820,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
+ if (!image) return;
eng_window_use(re->win);
re->win->gl_context->dc = context;
evas_gl_common_image_draw(re->win->gl_context, image,
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_generic
Modified Files:
evas_engine.c
Log Message:
fix color modulation for gl surfaces. also fix segvs tat can happen. xrender
engine is behind now though. can't do yuv surfaces (yet)
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_generic/evas_engine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_engine.c 17 Dec 2006 16:46:30 - 1.14
+++ evas_engine.c 19 Dec 2006 14:12:40 - 1.15
@@ -361,6 +361,7 @@
{
RGBA_Image *im;
+ if (!image) return NULL;
im = image;
if (im->cs.space != EVAS_COLORSPACE_ARGB)
{
@@ -414,6 +415,7 @@
{
RGBA_Image *im;
+ if (!image) return NULL;
im = image;
return im->info.comment;
}
@@ -429,6 +431,7 @@
{
RGBA_Image *im;
+ if (!image) return;
im = image;
if (im->cs.space == cspace) return;
switch (cspace)
@@ -600,6 +603,7 @@
static void *
eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
{
+ if (!image) return NULL;
evas_common_image_dirty(image);
evas_common_image_colorspace_dirty(image);
return image;
@@ -610,6 +614,11 @@
{
RGBA_Image *im;
+ if (!image)
+ {
+ *image_data = NULL;
+ return NULL;
+ }
im = image;
evas_common_load_image_data_from_file(im);
switch (im->cs.space)
@@ -650,6 +659,7 @@
{
RGBA_Image *im, *im2;
+ if (!image) return NULL;
im = image;
switch (im->cs.space)
{
@@ -691,6 +701,7 @@
{
RGBA_Image *im;
+ if (!image) return;
im = image;
if (im->cs.space == EVAS_COLORSPACE_ARGB)
evas_common_load_image_data_from_file(im);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
