forked from enlightenment/efl
Fix common misspellings
Following misspellings were fixed: accomodate->accommodate achive->achieve beacuse->because caluclate->calculate cant->can't carefull->careful convertion->conversion dependancy->dependency dependant->dependent doesnt->doesn't existant->existent extention->extension fucntion->function impliment->implement inital->initial lenght->length occured->occurred occuring->occurring onyl->only positon->position possibilty->possibility postion->position proccessing->processing proccess->process propogate->propagate recieve->receive sucessive->successive teh->the ther->there throught->through thsi->this wasnt->wasn't whcih->which wheras->whereas SVN revision: 51965
This commit is contained in:
parent
99897788f1
commit
85815e306c
|
@ -1068,7 +1068,7 @@ case $host_cpu in
|
||||||
esac
|
esac
|
||||||
AC_MSG_CHECKING(whether to build neon code)
|
AC_MSG_CHECKING(whether to build neon code)
|
||||||
AC_ARG_ENABLE(cpu-neon,
|
AC_ARG_ENABLE(cpu-neon,
|
||||||
AC_HELP_STRING([--enable-cpu-neon], [enable neon code - with gcc you will need these CFLAGS for it to begin to work, and even then your gcc may have broken or non-existant support: -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon]),
|
AC_HELP_STRING([--enable-cpu-neon], [enable neon code - with gcc you will need these CFLAGS for it to begin to work, and even then your gcc may have broken or non-existent support: -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon]),
|
||||||
[
|
[
|
||||||
if test "x$enableval" = "xyes" ; then
|
if test "x$enableval" = "xyes" ; then
|
||||||
AC_TRY_COMPILE([#include <arm_neon.h>],
|
AC_TRY_COMPILE([#include <arm_neon.h>],
|
||||||
|
|
|
@ -80,7 +80,7 @@ Ecore_Evas (http://docs.enlightenment.org/auto/ecore/).
|
||||||
|
|
||||||
Evas is a canvas display library. This is markedly different from most
|
Evas is a canvas display library. This is markedly different from most
|
||||||
display and windowing systems as a Canvas is structural and is also a state
|
display and windowing systems as a Canvas is structural and is also a state
|
||||||
engine, wheras most display and windowing systems are immediate mode display
|
engine, whereas most display and windowing systems are immediate mode display
|
||||||
targets. Evas handles the logic between a structural display via its' state
|
targets. Evas handles the logic between a structural display via its' state
|
||||||
engine, and controls the target windowing system in order to produce
|
engine, and controls the target windowing system in order to produce
|
||||||
rendered results of the current canvases state on the display.
|
rendered results of the current canvases state on the display.
|
||||||
|
@ -102,7 +102,7 @@ The series of commands is executed by the windowing system and the results
|
||||||
are displayed on the screen (normally). Once the commands are executed the
|
are displayed on the screen (normally). Once the commands are executed the
|
||||||
display system has little or no idea of how to reproduce this image again,
|
display system has little or no idea of how to reproduce this image again,
|
||||||
and so has to be instructed by the application how to redraw sections of the
|
and so has to be instructed by the application how to redraw sections of the
|
||||||
screen whenever needed. Each sucessive command will be executed as
|
screen whenever needed. Each successive command will be executed as
|
||||||
instructed by the application and either emulated by software or sent to the
|
instructed by the application and either emulated by software or sent to the
|
||||||
graphics hardware on the device to be performed.
|
graphics hardware on the device to be performed.
|
||||||
|
|
||||||
|
|
|
@ -1202,7 +1202,7 @@ message(void *fdata, Server *s, Client *c, int opcode, int size, unsigned char *
|
||||||
c->client_main->data = eina_list_remove(c->client_main->data, img);
|
c->client_main->data = eina_list_remove(c->client_main->data, img);
|
||||||
else
|
else
|
||||||
c->data = eina_list_remove(c->data, img);
|
c->data = eina_list_remove(c->data, img);
|
||||||
// FIXME: preload doesnt work async
|
// FIXME: preload doesn't work async
|
||||||
img_preload(img);
|
img_preload(img);
|
||||||
LKU(img->lock);
|
LKU(img->lock);
|
||||||
}
|
}
|
||||||
|
|
|
@ -290,7 +290,7 @@ typedef struct _Evas_Event_Hold Evas_Event_Hold; /**< Event structure for
|
||||||
|
|
||||||
/* load error identifiers, see evas_load_error_str() */
|
/* load error identifiers, see evas_load_error_str() */
|
||||||
#define EVAS_LOAD_ERROR_NONE 0 /**< No error on load */
|
#define EVAS_LOAD_ERROR_NONE 0 /**< No error on load */
|
||||||
#define EVAS_LOAD_ERROR_GENERIC 1 /**< A non-specific error occured */
|
#define EVAS_LOAD_ERROR_GENERIC 1 /**< A non-specific error occurred */
|
||||||
#define EVAS_LOAD_ERROR_DOES_NOT_EXIST 2 /**< File (or file path) does not exist */
|
#define EVAS_LOAD_ERROR_DOES_NOT_EXIST 2 /**< File (or file path) does not exist */
|
||||||
#define EVAS_LOAD_ERROR_PERMISSION_DENIED 3 /**< Permission deinied to an existing file (or path) */
|
#define EVAS_LOAD_ERROR_PERMISSION_DENIED 3 /**< Permission deinied to an existing file (or path) */
|
||||||
#define EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED 4 /**< Allocation of resources failure prevented load */
|
#define EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED 4 /**< Allocation of resources failure prevented load */
|
||||||
|
|
|
@ -73,7 +73,7 @@ evas_async_events_shutdown(void)
|
||||||
* that.
|
* that.
|
||||||
*
|
*
|
||||||
* An example of actual use of this API is for image asynchronous
|
* An example of actual use of this API is for image asynchronous
|
||||||
* preload inside evas. If the canvas was instantiated throught
|
* preload inside evas. If the canvas was instantiated through
|
||||||
* ecore-evas usage, ecore itself will take care of calling those
|
* ecore-evas usage, ecore itself will take care of calling those
|
||||||
* events' processing.
|
* events' processing.
|
||||||
*
|
*
|
||||||
|
|
|
@ -282,8 +282,8 @@ evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void
|
||||||
* The first parameter @p data in this function will be the same value
|
* The first parameter @p data in this function will be the same value
|
||||||
* passed to evas_object_event_callback_add() as the @p data
|
* passed to evas_object_event_callback_add() as the @p data
|
||||||
* parameter. The second parameter is a convenience for the programmer
|
* parameter. The second parameter is a convenience for the programmer
|
||||||
* to know what evas canvas the event occured on. The third parameter
|
* to know what evas canvas the event occurred on. The third parameter
|
||||||
* @p obj is the Object handle on which the event occured. The foruth
|
* @p obj is the Object handle on which the event occurred. The foruth
|
||||||
* parameter @p event_info is a pointer to a data structure that may
|
* parameter @p event_info is a pointer to a data structure that may
|
||||||
* or may not be passed to the callback, depending on the event type
|
* or may not be passed to the callback, depending on the event type
|
||||||
* that triggered the callback.
|
* that triggered the callback.
|
||||||
|
@ -604,7 +604,7 @@ evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, E
|
||||||
* The first parameter @p data in this function will be the same value
|
* The first parameter @p data in this function will be the same value
|
||||||
* passed to evas_event_callback_add() as the @p data parameter. The
|
* passed to evas_event_callback_add() as the @p data parameter. The
|
||||||
* second parameter @p e is the canvas handle on which the event
|
* second parameter @p e is the canvas handle on which the event
|
||||||
* occured. The third parameter @p event_info is a pointer to a data
|
* occurred. The third parameter @p event_info is a pointer to a data
|
||||||
* structure that may or may not be passed to the callback, depending
|
* structure that may or may not be passed to the callback, depending
|
||||||
* on the event type that triggered the callback.
|
* on the event type that triggered the callback.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1584,7 +1584,7 @@ evas_object_pass_events_get(const Evas_Object *obj)
|
||||||
* callbacks, but also to be repeated on the next lower object in the
|
* callbacks, but also to be repeated on the next lower object in the
|
||||||
* stack.
|
* stack.
|
||||||
*
|
*
|
||||||
* If @p repeat is false, events occuring on @p obj will be processed
|
* If @p repeat is false, events occurring on @p obj will be processed
|
||||||
* normally.
|
* normally.
|
||||||
*/
|
*/
|
||||||
EAPI void
|
EAPI void
|
||||||
|
@ -1634,7 +1634,7 @@ evas_object_repeat_events_get(const Evas_Object *obj)
|
||||||
* This function has no effect if @p obj is not a member of a smart
|
* This function has no effect if @p obj is not a member of a smart
|
||||||
* object.
|
* object.
|
||||||
*
|
*
|
||||||
* If @p prop is true, events occuring on this object will propagate on
|
* If @p prop is true, events occurring on this object will propagate on
|
||||||
* to the smart object of which @p obj is a member.
|
* to the smart object of which @p obj is a member.
|
||||||
*
|
*
|
||||||
* If @p prop is false, events for which callbacks are set on the member
|
* If @p prop is false, events for which callbacks are set on the member
|
||||||
|
@ -1654,7 +1654,7 @@ evas_object_propagate_events_set(Evas_Object *obj, Eina_Bool prop)
|
||||||
/**
|
/**
|
||||||
* Determine whether an object is set to propagate events.
|
* Determine whether an object is set to propagate events.
|
||||||
* @param obj
|
* @param obj
|
||||||
* @return propogate events state
|
* @return propagate events state
|
||||||
*/
|
*/
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
evas_object_propagate_events_get(const Evas_Object *obj)
|
evas_object_propagate_events_get(const Evas_Object *obj)
|
||||||
|
|
|
@ -195,7 +195,7 @@ evas_object_layer_set(Evas_Object *obj, short l)
|
||||||
/**
|
/**
|
||||||
* Retrieves the layer of the evas that the given object is part of.
|
* Retrieves the layer of the evas that the given object is part of.
|
||||||
*
|
*
|
||||||
* Be carefull, it doesn't make sense to change the layer of smart object's
|
* Be careful, it doesn't make sense to change the layer of smart object's
|
||||||
* child. So the returned value could be wrong in some case. Don't rely on
|
* child. So the returned value could be wrong in some case. Don't rely on
|
||||||
* it's accuracy.
|
* it's accuracy.
|
||||||
*
|
*
|
||||||
|
|
|
@ -403,7 +403,7 @@ evas_engine_info_get(const Evas *e)
|
||||||
*
|
*
|
||||||
* @param e The pointer to the Evas Canvas
|
* @param e The pointer to the Evas Canvas
|
||||||
* @param info The pointer to the Engine Info to use
|
* @param info The pointer to the Engine Info to use
|
||||||
* @return 1 if no error occured, 0 otherwise
|
* @return 1 if no error occurred, 0 otherwise
|
||||||
* @ingroup Evas_Output_Method
|
* @ingroup Evas_Output_Method
|
||||||
*/
|
*/
|
||||||
EAPI int
|
EAPI int
|
||||||
|
@ -1172,7 +1172,7 @@ evas_load_error_str(int error)
|
||||||
case EVAS_LOAD_ERROR_NONE:
|
case EVAS_LOAD_ERROR_NONE:
|
||||||
return "No error on load";
|
return "No error on load";
|
||||||
case EVAS_LOAD_ERROR_GENERIC:
|
case EVAS_LOAD_ERROR_GENERIC:
|
||||||
return "A non-specific error occured";
|
return "A non-specific error occurred";
|
||||||
case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
|
case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
|
||||||
return "File (or file path) does not exist";
|
return "File (or file path) does not exist";
|
||||||
case EVAS_LOAD_ERROR_PERMISSION_DENIED:
|
case EVAS_LOAD_ERROR_PERMISSION_DENIED:
|
||||||
|
@ -1274,7 +1274,7 @@ evas_color_argb_unpremul(int a, int *r, int *g, int *b)
|
||||||
* Pre-multiplies data by an alpha factor.
|
* Pre-multiplies data by an alpha factor.
|
||||||
*
|
*
|
||||||
* @param data The data value.
|
* @param data The data value.
|
||||||
* @param len The lenght value.
|
* @param len The length value.
|
||||||
*
|
*
|
||||||
* This function pre-multiplies a given data by an alpha
|
* This function pre-multiplies a given data by an alpha
|
||||||
* factor. Alpha factor is used to define transparency.
|
* factor. Alpha factor is used to define transparency.
|
||||||
|
@ -1292,7 +1292,7 @@ evas_data_argb_premul(unsigned int *data, unsigned int len)
|
||||||
* Undo pre-multiplication data by an alpha factor.
|
* Undo pre-multiplication data by an alpha factor.
|
||||||
*
|
*
|
||||||
* @param data The data value.
|
* @param data The data value.
|
||||||
* @param len The lenght value.
|
* @param len The length value.
|
||||||
*
|
*
|
||||||
* This function undoes pre-multiplication of a given data by an alpha
|
* This function undoes pre-multiplication of a given data by an alpha
|
||||||
* factor. Alpha factor is used to define transparency.
|
* factor. Alpha factor is used to define transparency.
|
||||||
|
|
|
@ -992,8 +992,8 @@ evas_map_util_points_color_set(Evas_Map *m, int r, int g, int b, int a)
|
||||||
*
|
*
|
||||||
* @param m map to change.
|
* @param m map to change.
|
||||||
* @param degrees amount of degrees from 0.0 to 360.0 to rotate.
|
* @param degrees amount of degrees from 0.0 to 360.0 to rotate.
|
||||||
* @param cx rotation's center horizontal positon.
|
* @param cx rotation's center horizontal position.
|
||||||
* @param cy rotation's center vertical positon.
|
* @param cy rotation's center vertical position.
|
||||||
*
|
*
|
||||||
* @see evas_map_point_coord_set()
|
* @see evas_map_point_coord_set()
|
||||||
* @see evas_map_util_zoom()
|
* @see evas_map_util_zoom()
|
||||||
|
@ -1037,8 +1037,8 @@ evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy)
|
||||||
* @param m map to change.
|
* @param m map to change.
|
||||||
* @param zoomx horizontal zoom to use.
|
* @param zoomx horizontal zoom to use.
|
||||||
* @param zoomy vertical zoom to use.
|
* @param zoomy vertical zoom to use.
|
||||||
* @param cx zooming center horizontal positon.
|
* @param cx zooming center horizontal position.
|
||||||
* @param cy zooming center vertical positon.
|
* @param cy zooming center vertical position.
|
||||||
*
|
*
|
||||||
* @see evas_map_point_coord_set()
|
* @see evas_map_point_coord_set()
|
||||||
* @see evas_map_util_rotate()
|
* @see evas_map_util_rotate()
|
||||||
|
@ -1081,9 +1081,9 @@ evas_map_util_zoom(Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_
|
||||||
* @param dx amount of degrees from 0.0 to 360.0 to rotate arount X axis.
|
* @param dx amount of degrees from 0.0 to 360.0 to rotate arount X axis.
|
||||||
* @param dy amount of degrees from 0.0 to 360.0 to rotate arount Y axis.
|
* @param dy amount of degrees from 0.0 to 360.0 to rotate arount Y axis.
|
||||||
* @param dz amount of degrees from 0.0 to 360.0 to rotate arount Z axis.
|
* @param dz amount of degrees from 0.0 to 360.0 to rotate arount Z axis.
|
||||||
* @param cx rotation's center horizontal positon.
|
* @param cx rotation's center horizontal position.
|
||||||
* @param cy rotation's center vertical positon.
|
* @param cy rotation's center vertical position.
|
||||||
* @param cz rotation's center vertical positon.
|
* @param cz rotation's center vertical position.
|
||||||
*/
|
*/
|
||||||
EAPI void
|
EAPI void
|
||||||
evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz,
|
evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz,
|
||||||
|
|
|
@ -777,7 +777,7 @@ _evas_object_box_layout_horizontal_weight_apply(Evas_Object_Box_Data *priv, Evas
|
||||||
* properties apply for padding/positioning relative to the overall
|
* properties apply for padding/positioning relative to the overall
|
||||||
* height of the box. Finally, there is the @c weight_x property,
|
* height of the box. Finally, there is the @c weight_x property,
|
||||||
* which, if set to a non-zero value, tells the container that the
|
* which, if set to a non-zero value, tells the container that the
|
||||||
* child width is not pre-defined. If the container can't accomodate
|
* child width is not pre-defined. If the container can't accommodate
|
||||||
* all its children, it sets the widths of the children *with weights*
|
* all its children, it sets the widths of the children *with weights*
|
||||||
* to sizes as small as they can all fit into it. If the size
|
* to sizes as small as they can all fit into it. If the size
|
||||||
* required by the children is less than the available, the box
|
* required by the children is less than the available, the box
|
||||||
|
|
|
@ -2762,7 +2762,7 @@ evas_object_image_render_pre(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* if it changed geometry - and obviously not visibility or color */
|
/* if it changed geometry - and obviously not visibility or color */
|
||||||
/* caluclate differences since we have a constant color fill */
|
/* calculate differences since we have a constant color fill */
|
||||||
/* we really only need to update the differences */
|
/* we really only need to update the differences */
|
||||||
#if 0 // XXX: maybe buggy?
|
#if 0 // XXX: maybe buggy?
|
||||||
if (((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
if (((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
||||||
|
|
|
@ -249,7 +249,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *obj)
|
||||||
*
|
*
|
||||||
* @param obj The given canvas object pointer.
|
* @param obj The given canvas object pointer.
|
||||||
* @param func The given function to be the callback function.
|
* @param func The given function to be the callback function.
|
||||||
* @param data The data passed to the callback fucntion.
|
* @param data The data passed to the callback function.
|
||||||
*
|
*
|
||||||
* This function sets a callback function to intercepts a show event
|
* This function sets a callback function to intercepts a show event
|
||||||
* of a canvas object.
|
* of a canvas object.
|
||||||
|
@ -308,7 +308,7 @@ evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_
|
||||||
*
|
*
|
||||||
* @param obj The given canvas object pointer.
|
* @param obj The given canvas object pointer.
|
||||||
* @param func The given function to be the callback function.
|
* @param func The given function to be the callback function.
|
||||||
* @param data The data passed to the callback fucntion.
|
* @param data The data passed to the callback function.
|
||||||
*
|
*
|
||||||
* This function sets a callback function to intercepts a hide event
|
* This function sets a callback function to intercepts a hide event
|
||||||
* of a canvas object.
|
* of a canvas object.
|
||||||
|
@ -366,7 +366,7 @@ evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_
|
||||||
*
|
*
|
||||||
* @param obj The given canvas object pointer.
|
* @param obj The given canvas object pointer.
|
||||||
* @param func The given function to be the callback function.
|
* @param func The given function to be the callback function.
|
||||||
* @param data The data passed to the callback fucntion.
|
* @param data The data passed to the callback function.
|
||||||
*
|
*
|
||||||
* This function sets a callback function to intercepts a move event
|
* This function sets a callback function to intercepts a move event
|
||||||
* of a canvas object.
|
* of a canvas object.
|
||||||
|
|
|
@ -375,7 +375,7 @@ evas_object_line_render_pre(Evas_Object *obj)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* if it changed geometry - and obviously not visibility or color */
|
/* if it changed geometry - and obviously not visibility or color */
|
||||||
/* caluclate differences since we have a constant color fill */
|
/* calculate differences since we have a constant color fill */
|
||||||
/* we really only need to update the differences */
|
/* we really only need to update the differences */
|
||||||
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
||||||
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
||||||
|
|
|
@ -508,7 +508,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||||
* @endcode
|
* @endcode
|
||||||
* This is more evident in images, but text, textblock, lines
|
* This is more evident in images, but text, textblock, lines
|
||||||
* and polygons will behave similarly. Check their specific APIs
|
* and polygons will behave similarly. Check their specific APIs
|
||||||
* to know how to achive your desired behavior.
|
* to know how to achieve your desired behavior.
|
||||||
*
|
*
|
||||||
* @ingroup Evas_Object_Group_Basic
|
* @ingroup Evas_Object_Group_Basic
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -415,7 +415,7 @@ evas_object_polygon_render_pre(Evas_Object *obj)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* if it changed geometry - and obviously not visibility or color */
|
/* if it changed geometry - and obviously not visibility or color */
|
||||||
/* caluclate differences since we have a constant color fill */
|
/* calculate differences since we have a constant color fill */
|
||||||
/* we really only need to update the differences */
|
/* we really only need to update the differences */
|
||||||
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
||||||
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
||||||
|
|
|
@ -233,7 +233,7 @@ evas_object_rectangle_render_pre(Evas_Object *obj)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* if it changed geometry - and obviously not visibility or color */
|
/* if it changed geometry - and obviously not visibility or color */
|
||||||
/* caluclate differences since we have a constant color fill */
|
/* calculate differences since we have a constant color fill */
|
||||||
/* we really only need to update the differences */
|
/* we really only need to update the differences */
|
||||||
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
||||||
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
||||||
|
|
|
@ -477,7 +477,7 @@ evas_object_smart_callback_del(Evas_Object *obj, const char *event, void (*func)
|
||||||
* @param event_info an event specific struct of info to pass to the callback
|
* @param event_info an event specific struct of info to pass to the callback
|
||||||
*
|
*
|
||||||
* This should be called internally in the smart object when some specific
|
* This should be called internally in the smart object when some specific
|
||||||
* event has occured. The documentation for the smart object should include
|
* event has occurred. The documentation for the smart object should include
|
||||||
* a list of possible events and what type of @p event_info to expect.
|
* a list of possible events and what type of @p event_info to expect.
|
||||||
*
|
*
|
||||||
* @ingroup Evas_Smart_Object_Group
|
* @ingroup Evas_Smart_Object_Group
|
||||||
|
|
|
@ -650,7 +650,7 @@ evas_object_text_char_pos_get(const Evas_Object *obj, int pos, Evas_Coord *cx, E
|
||||||
/**
|
/**
|
||||||
* Returns the logical position of the last char in the text
|
* Returns the logical position of the last char in the text
|
||||||
* up to the pos given. this is NOT the position of the last char
|
* up to the pos given. this is NOT the position of the last char
|
||||||
* because of the possibilty of RTL in the text.
|
* because of the possibility of RTL in the text.
|
||||||
* To be documented.
|
* To be documented.
|
||||||
*
|
*
|
||||||
* FIXME: To be fixed.
|
* FIXME: To be fixed.
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
* also have the added benefit of updating automatically upon textblock changes,
|
* also have the added benefit of updating automatically upon textblock changes,
|
||||||
* this means that if you have a cursor pointing to a specific character, it'll
|
* this means that if you have a cursor pointing to a specific character, it'll
|
||||||
* still point to it even after you change the whole object completely (as long
|
* still point to it even after you change the whole object completely (as long
|
||||||
* as the char was not deleted), this is not possible without updating, beacuse
|
* as the char was not deleted), this is not possible without updating, because
|
||||||
* as mentioned, each cursor holds a character position. There are many
|
* as mentioned, each cursor holds a character position. There are many
|
||||||
* functions that handle cursors, just check out the evas_textblock_cursor*
|
* functions that handle cursors, just check out the evas_textblock_cursor*
|
||||||
* functions. For creation and deletion of cursors check out:
|
* functions. For creation and deletion of cursors check out:
|
||||||
|
@ -1166,7 +1166,7 @@ _format_clean_param(char *dst, const char *src)
|
||||||
*
|
*
|
||||||
* @param obj the evas object - should not be NULL.
|
* @param obj the evas object - should not be NULL.
|
||||||
* @param fmt The format to populate - should not be NULL.
|
* @param fmt The format to populate - should not be NULL.
|
||||||
* @param[in] cmd the command to proccess, should be stringshared.
|
* @param[in] cmd the command to process, should be stringshared.
|
||||||
* @param[in] param the parameter of the command.
|
* @param[in] param the parameter of the command.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
|
@ -2729,8 +2729,8 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node_Format *n, const cha
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @internal
|
* @internal
|
||||||
* Handles a format by proccessing a format node. It returns the relevant format
|
* Handles a format by processing a format node. It returns the relevant format
|
||||||
* through _fmt and updates the padding throught style_pad_*. If needed,
|
* through _fmt and updates the padding through style_pad_*. If needed,
|
||||||
* it creates a format item.
|
* it creates a format item.
|
||||||
*
|
*
|
||||||
* @param obj the evas object - NOT NULL.
|
* @param obj the evas object - NOT NULL.
|
||||||
|
@ -2997,7 +2997,7 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_
|
||||||
/* run through all text and format nodes generating lines */
|
/* run through all text and format nodes generating lines */
|
||||||
if (!c->o->text_nodes && !c->o->format_nodes)
|
if (!c->o->text_nodes && !c->o->format_nodes)
|
||||||
{
|
{
|
||||||
/* If there are no nodes and lines, do the inital creation. */
|
/* If there are no nodes and lines, do the initial creation. */
|
||||||
if (!c->par && !c->ln)
|
if (!c->par && !c->ln)
|
||||||
{
|
{
|
||||||
_layout_paragraph_new(c);
|
_layout_paragraph_new(c);
|
||||||
|
@ -4134,7 +4134,7 @@ _evas_textblock_cursor_nodes_merge(Evas_Textblock_Cursor *cur)
|
||||||
* Return the format at a specific position.
|
* Return the format at a specific position.
|
||||||
*
|
*
|
||||||
* @param cur the cursor to the position.
|
* @param cur the cursor to the position.
|
||||||
* @return the format node at the specific postion or NULL if not found.
|
* @return the format node at the specific position or NULL if not found.
|
||||||
*/
|
*/
|
||||||
static Evas_Object_Textblock_Node_Format *
|
static Evas_Object_Textblock_Node_Format *
|
||||||
_evas_textblock_cursor_node_format_at_pos_get(const Evas_Textblock_Cursor *cur)
|
_evas_textblock_cursor_node_format_at_pos_get(const Evas_Textblock_Cursor *cur)
|
||||||
|
@ -4169,7 +4169,7 @@ _evas_textblock_cursor_node_format_at_pos_get(const Evas_Textblock_Cursor *cur)
|
||||||
* @internal
|
* @internal
|
||||||
* Return the last format node at the position of the format node n.
|
* Return the last format node at the position of the format node n.
|
||||||
*
|
*
|
||||||
* @param n a format node at the positon.
|
* @param n a format node at the position.
|
||||||
* @return the last format node at the position of n.
|
* @return the last format node at the position of n.
|
||||||
*/
|
*/
|
||||||
static Evas_Object_Textblock_Node_Format *
|
static Evas_Object_Textblock_Node_Format *
|
||||||
|
@ -4193,7 +4193,7 @@ _evas_textblock_node_format_last_at_off(const Evas_Object_Textblock_Node_Format
|
||||||
* Returns the visible format at a specific location.
|
* Returns the visible format at a specific location.
|
||||||
*
|
*
|
||||||
* @param n a format at the specific position.
|
* @param n a format at the specific position.
|
||||||
* @return the format node at the specific postion or NULL if not found.
|
* @return the format node at the specific position or NULL if not found.
|
||||||
*/
|
*/
|
||||||
static Evas_Object_Textblock_Node_Format *
|
static Evas_Object_Textblock_Node_Format *
|
||||||
_evas_textblock_node_visible_at_pos_get(const Evas_Object_Textblock_Node_Format *n)
|
_evas_textblock_node_visible_at_pos_get(const Evas_Object_Textblock_Node_Format *n)
|
||||||
|
@ -4222,7 +4222,7 @@ _evas_textblock_node_visible_at_pos_get(const Evas_Object_Textblock_Node_Format
|
||||||
* position of the cursor in the text node is returned or the previous's text
|
* position of the cursor in the text node is returned or the previous's text
|
||||||
* node's format node.
|
* node's format node.
|
||||||
*
|
*
|
||||||
* @param cur teh position to look at.
|
* @param cur the position to look at.
|
||||||
* @return the format node found.
|
* @return the format node found.
|
||||||
*/
|
*/
|
||||||
static Evas_Object_Textblock_Node_Format *
|
static Evas_Object_Textblock_Node_Format *
|
||||||
|
@ -4272,7 +4272,7 @@ _evas_textblock_cursor_node_format_before_or_at_pos_get(const Evas_Textblock_Cur
|
||||||
* position of the cursor in the text node is returned or the previous's text
|
* position of the cursor in the text node is returned or the previous's text
|
||||||
* node's format node.
|
* node's format node.
|
||||||
*
|
*
|
||||||
* @param cur teh position to look at.
|
* @param cur the position to look at.
|
||||||
* @return the format node found.
|
* @return the format node found.
|
||||||
*/
|
*/
|
||||||
static Evas_Object_Textblock_Node_Format *
|
static Evas_Object_Textblock_Node_Format *
|
||||||
|
@ -7730,7 +7730,7 @@ evas_object_textblock_render_pre(Evas_Object *obj)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* if it changed geometry - and obviously not visibility or color */
|
/* if it changed geometry - and obviously not visibility or color */
|
||||||
/* caluclate differences since we have a constant color fill */
|
/* calculate differences since we have a constant color fill */
|
||||||
/* we really only need to update the differences */
|
/* we really only need to update the differences */
|
||||||
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
|
||||||
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
(obj->cur.geometry.y != obj->prev.geometry.y) ||
|
||||||
|
|
|
@ -160,7 +160,7 @@ evas_common_convert_yuv_420p_601_rgba(DATA8 **src, DATA8 *dst, int w, int h)
|
||||||
/* Thanks to Diz for this code. i've munged it a little and turned it into */
|
/* Thanks to Diz for this code. i've munged it a little and turned it into */
|
||||||
/* inline macros. I tried beating it with a different algorithm using MMX */
|
/* inline macros. I tried beating it with a different algorithm using MMX */
|
||||||
/* but failed. So here we are. This is the fastest YUV->RGB i know of for */
|
/* but failed. So here we are. This is the fastest YUV->RGB i know of for */
|
||||||
/* x86. It has an issue that it doesnt convert colours accurately so the */
|
/* x86. It has an issue that it doesn't convert colours accurately so the */
|
||||||
/* image looks a little "yellowy". This is a result of only 10.6 fixed point */
|
/* image looks a little "yellowy". This is a result of only 10.6 fixed point */
|
||||||
/* resolution as opposed to 16.16 in the C code. This could be fixed by */
|
/* resolution as opposed to 16.16 in the C code. This could be fixed by */
|
||||||
/* processing half the number of pixels per cycle and going up to 32bits */
|
/* processing half the number of pixels per cycle and going up to 32bits */
|
||||||
|
@ -557,7 +557,7 @@ _evas_yv12torgb_altivec(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
/* 2 */ tmp1 = vec_perm(tmp1, tmp1, uperm);
|
/* 2 */ tmp1 = vec_perm(tmp1, tmp1, uperm);
|
||||||
/* 2 */ tmp2 = vec_perm(tmp2, tmp2, vperm);
|
/* 2 */ tmp2 = vec_perm(tmp2, tmp2, vperm);
|
||||||
|
|
||||||
/* Avoid dependancy stalls on yperm and calculate the 4 u values */
|
/* Avoid dependency stalls on yperm and calculate the 4 u values */
|
||||||
/* 3 */ yperm = vec_lvsr(12, yp1);
|
/* 3 */ yperm = vec_lvsr(12, yp1);
|
||||||
/* 1 */ tmp1 = (vector signed short)vec_mergeh((vector unsigned char)tmp1,
|
/* 1 */ tmp1 = (vector signed short)vec_mergeh((vector unsigned char)tmp1,
|
||||||
(vector unsigned char)tmp1);
|
(vector unsigned char)tmp1);
|
||||||
|
@ -586,7 +586,7 @@ _evas_yv12torgb_altivec(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
/* 1 */ y = vec_sub(y, c16);
|
/* 1 */ y = vec_sub(y, c16);
|
||||||
/* 4 */ y = vec_mladd(ymul, y, (vector signed short)zero);
|
/* 4 */ y = vec_mladd(ymul, y, (vector signed short)zero);
|
||||||
|
|
||||||
/* Perform non-dependant multiplies first. */
|
/* Perform non-dependent multiplies first. */
|
||||||
/* 4 */ tmp1 = vec_mladd(crv, v, y);
|
/* 4 */ tmp1 = vec_mladd(crv, v, y);
|
||||||
/* 4 */ tmp2 = vec_mladd(cgv, v, tmp2);
|
/* 4 */ tmp2 = vec_mladd(cgv, v, tmp2);
|
||||||
/* 4 */ tmp3 = vec_mladd(cbu, u, y);
|
/* 4 */ tmp3 = vec_mladd(cbu, u, y);
|
||||||
|
@ -643,7 +643,7 @@ _evas_yv12torgb_altivec(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
/* 1 */ y = (vector signed short)vec_mergeh(zero,
|
/* 1 */ y = (vector signed short)vec_mergeh(zero,
|
||||||
(vector unsigned char)y);
|
(vector unsigned char)y);
|
||||||
|
|
||||||
/* Avoid dependancy stalls on yperm */
|
/* Avoid dependency stalls on yperm */
|
||||||
/* 2 */ tmp3 = vec_perm(tmp3, tmp3, yperm);
|
/* 2 */ tmp3 = vec_perm(tmp3, tmp3, yperm);
|
||||||
/* 1 */ tmp3 = (vector signed short)vec_mergeh(zero,
|
/* 1 */ tmp3 = (vector signed short)vec_mergeh(zero,
|
||||||
(vector unsigned char)tmp3);
|
(vector unsigned char)tmp3);
|
||||||
|
@ -656,7 +656,7 @@ _evas_yv12torgb_altivec(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
/* 1 */ y = vec_sub(y, c16);
|
/* 1 */ y = vec_sub(y, c16);
|
||||||
/* 4 */ y = vec_mladd(ymul, y, (vector signed short)zero);
|
/* 4 */ y = vec_mladd(ymul, y, (vector signed short)zero);
|
||||||
|
|
||||||
/* Perform non-dependant multiplies first. */
|
/* Perform non-dependent multiplies first. */
|
||||||
/* 4 */ tmp2 = vec_mladd(cgv, v, tmp2);
|
/* 4 */ tmp2 = vec_mladd(cgv, v, tmp2);
|
||||||
/* 4 */ tmp1 = vec_mladd(crv, v, y);
|
/* 4 */ tmp1 = vec_mladd(crv, v, y);
|
||||||
/* 4 */ tmp3 = vec_mladd(cbu, u, y);
|
/* 4 */ tmp3 = vec_mladd(cbu, u, y);
|
||||||
|
@ -775,7 +775,7 @@ _evas_yv12torgb_diz(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
u = (*up++) - 128;
|
u = (*up++) - 128;
|
||||||
v = (*vp++) - 128;
|
v = (*vp++) - 128;
|
||||||
|
|
||||||
/* do the top 2 pixels of the 2x2 block whcih shared u & v */
|
/* do the top 2 pixels of the 2x2 block which shared u & v */
|
||||||
/* yuv to rgb */
|
/* yuv to rgb */
|
||||||
y = YMUL * ((*yp1++) - 16);
|
y = YMUL * ((*yp1++) - 16);
|
||||||
r = LUT_CLIP((y + (crv * v)) >> 16);
|
r = LUT_CLIP((y + (crv * v)) >> 16);
|
||||||
|
@ -854,7 +854,7 @@ _evas_yv12torgb_raster(unsigned char **yuv, unsigned char *rgb, int w, int h)
|
||||||
u = _v2018[u];
|
u = _v2018[u];
|
||||||
v = _v1596[v];
|
v = _v1596[v];
|
||||||
|
|
||||||
/* do the top 2 pixels of the 2x2 block whcih shared u & v */
|
/* do the top 2 pixels of the 2x2 block which shared u & v */
|
||||||
/* yuv to rgb */
|
/* yuv to rgb */
|
||||||
y = _v1164[*yp1++];
|
y = _v1164[*yp1++];
|
||||||
*((DATA32 *) dp1) = 0xff000000 + RGB_JOIN(LUT_CLIP(y + v), LUT_CLIP(y - vmu), LUT_CLIP(y + u));
|
*((DATA32 *) dp1) = 0xff000000 + RGB_JOIN(LUT_CLIP(y + v), LUT_CLIP(y - vmu), LUT_CLIP(y + u));
|
||||||
|
|
|
@ -382,7 +382,7 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BiDi handling: We recieve the shaped string + other props from intl_props,
|
* BiDi handling: We receive the shaped string + other props from intl_props,
|
||||||
* we need to reorder it so we'll have the visual string (the way we draw)
|
* we need to reorder it so we'll have the visual string (the way we draw)
|
||||||
* and then for kerning we have to switch the order of the kerning query (as the prev
|
* and then for kerning we have to switch the order of the kerning query (as the prev
|
||||||
* is on the right, and not on the left).
|
* is on the right, and not on the left).
|
||||||
|
|
|
@ -25,7 +25,7 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
|
||||||
|
|
||||||
/* NOTE: ft2 seems to have a bug. and sometimes returns bizarre
|
/* NOTE: ft2 seems to have a bug. and sometimes returns bizarre
|
||||||
* values to kern by - given same font, same size and same
|
* values to kern by - given same font, same size and same
|
||||||
* prev_index and index. auto/bytecode or none hinting doesnt
|
* prev_index and index. auto/bytecode or none hinting doesn't
|
||||||
* matter */
|
* matter */
|
||||||
FTLOCK();
|
FTLOCK();
|
||||||
if (FT_Get_Kerning(fi->src->ft.face,
|
if (FT_Get_Kerning(fi->src->ft.face,
|
||||||
|
@ -57,7 +57,7 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* size of the string (width and height) in pixels
|
/* size of the string (width and height) in pixels
|
||||||
* BiDi handling: We recieve the shaped string + other props from intl_props,
|
* BiDi handling: We receive the shaped string + other props from intl_props,
|
||||||
* We only care about the size, and the size does not depend on the visual order.
|
* We only care about the size, and the size does not depend on the visual order.
|
||||||
* As long as we follow the logical string and get kerning data like we should,
|
* As long as we follow the logical string and get kerning data like we should,
|
||||||
* we are fine.
|
* we are fine.
|
||||||
|
@ -216,7 +216,7 @@ evas_common_font_query_inset(RGBA_Font *fn, const Eina_Unicode *text)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* h & v advance
|
/* h & v advance
|
||||||
* BiDi handling: We recieve the shaped string + other props from intl_props,
|
* BiDi handling: We receive the shaped string + other props from intl_props,
|
||||||
* We don't care about the order, as heights will remain the same (we already did
|
* We don't care about the order, as heights will remain the same (we already did
|
||||||
* shaping) and as long as we go through the logical string and match the kerning
|
* shaping) and as long as we go through the logical string and match the kerning
|
||||||
* this way, we are safe.
|
* this way, we are safe.
|
||||||
|
@ -309,7 +309,7 @@ evas_common_font_query_advance(RGBA_Font *fn, const Eina_Unicode *text, const Ev
|
||||||
|
|
||||||
/* x y w h for char at char pos for null it returns the position right after
|
/* x y w h for char at char pos for null it returns the position right after
|
||||||
* the last char with 0 as width and height.
|
* the last char with 0 as width and height.
|
||||||
* BiDi handling: We recieve the shaped string + other props from intl_props,
|
* BiDi handling: We receive the shaped string + other props from intl_props,
|
||||||
* We care about the actual drawing location of the string, this is why we need
|
* We care about the actual drawing location of the string, this is why we need
|
||||||
* the visual string. We need to know how it's printed. After that we need to calculate
|
* the visual string. We need to know how it's printed. After that we need to calculate
|
||||||
* the reverse kerning in case of rtl parts. "pos" passed to this function is an
|
* the reverse kerning in case of rtl parts. "pos" passed to this function is an
|
||||||
|
@ -629,7 +629,7 @@ end:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* position of the last char in thext text that will fit in xy.
|
/* position of the last char in thext text that will fit in xy.
|
||||||
* BiDi handling: We recieve the shaped string + other props from intl_props,
|
* BiDi handling: We receive the shaped string + other props from intl_props,
|
||||||
* All we care about is char sizes + kerning so we only really need to get the
|
* All we care about is char sizes + kerning so we only really need to get the
|
||||||
* shaped string to utf8, and then just go through it like in english, as it's
|
* shaped string to utf8, and then just go through it like in english, as it's
|
||||||
* just the logical string, nothing special about that.
|
* just the logical string, nothing special about that.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
struct ext_loader_s
|
struct ext_loader_s
|
||||||
{
|
{
|
||||||
const char *extention;
|
const char *extension;
|
||||||
const char *loader;
|
const char *loader;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ evas_common_load_rgba_image_module_from_file(Image_Entry *ie)
|
||||||
{
|
{
|
||||||
for (i = 0, ++dot; i < (sizeof (loaders) / sizeof (struct ext_loader_s)); ++i)
|
for (i = 0, ++dot; i < (sizeof (loaders) / sizeof (struct ext_loader_s)); ++i)
|
||||||
{
|
{
|
||||||
if (!strcasecmp(dot, loaders[i].extention))
|
if (!strcasecmp(dot, loaders[i].extension))
|
||||||
{
|
{
|
||||||
loader = loaders[i].loader;
|
loader = loaders[i].loader;
|
||||||
DBG("known loader '%s' handles extension '%s' of file '%s'",
|
DBG("known loader '%s' handles extension '%s' of file '%s'",
|
||||||
|
|
|
@ -235,7 +235,7 @@ evas_common_regionbuf_span_del(Regionbuf *rb, int x1, int x2, int y)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* it ends on or after the end of thsi span */
|
/* it ends on or after the end of this span */
|
||||||
else if (x2 >= sp_start->x2)
|
else if (x2 >= sp_start->x2)
|
||||||
{
|
{
|
||||||
/* it starts after the start */
|
/* it starts after the start */
|
||||||
|
|
|
@ -1068,7 +1068,7 @@ evas_common_tilebuf_add_motion_vector(Tilebuf *tb, int x, int y, int w, int h, i
|
||||||
}
|
}
|
||||||
return num;
|
return num;
|
||||||
#else
|
#else
|
||||||
/* FIXME: need to actually impliment motion vectors. for now it just */
|
/* FIXME: need to actually implement motion vectors. for now it just */
|
||||||
/* implements redraws */
|
/* implements redraws */
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* os dependant file code. for unix-y like fs's only for now */
|
/* os dependent file code. for unix-y like fs's only for now */
|
||||||
/* if your os doesn't use unix-like fs starting with "/" for the root and */
|
/* if your os doesn't use unix-like fs starting with "/" for the root and */
|
||||||
/* the file path separator isn't "/" then you may need to help out by */
|
/* the file path separator isn't "/" then you may need to help out by */
|
||||||
/* adding in a new set of functions here */
|
/* adding in a new set of functions here */
|
||||||
|
|
|
@ -10,15 +10,15 @@ static int _evas_debug_show = 0;
|
||||||
static int _evas_debug_abort = 0;
|
static int _evas_debug_abort = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return if any allocation errors have occured during the prior function
|
* Return if any allocation errors have occurred during the prior function
|
||||||
* @return The allocation error flag
|
* @return The allocation error flag
|
||||||
*
|
*
|
||||||
* This function will return if any memory allocation errors occured during,
|
* This function will return if any memory allocation errors occurred during,
|
||||||
* and what kind they were. The return value will be one of
|
* and what kind they were. The return value will be one of
|
||||||
* EVAS_ALLOC_ERROR_NONE, EVAS_ALLOC_ERROR_FATAL or EVAS_ALLOC_ERROR_RECOVERED
|
* EVAS_ALLOC_ERROR_NONE, EVAS_ALLOC_ERROR_FATAL or EVAS_ALLOC_ERROR_RECOVERED
|
||||||
* with each meaning something different.
|
* with each meaning something different.
|
||||||
*
|
*
|
||||||
* EVAS_ALLOC_ERROR_NONE means that no errors occured at all and the function
|
* EVAS_ALLOC_ERROR_NONE means that no errors occurred at all and the function
|
||||||
* worked as expected.
|
* worked as expected.
|
||||||
*
|
*
|
||||||
* EVAS_ALLOC_ERROR_FATAL means the function was completely unable to perform
|
* EVAS_ALLOC_ERROR_FATAL means the function was completely unable to perform
|
||||||
|
@ -27,7 +27,7 @@ static int _evas_debug_abort = 0;
|
||||||
* recover from the prior functions failure (or try free up memory elsewhere
|
* recover from the prior functions failure (or try free up memory elsewhere
|
||||||
* and try again after more memory is freed).
|
* and try again after more memory is freed).
|
||||||
*
|
*
|
||||||
* EVAS_ALLOC_ERROR_RECOVERED means that an allocation error occured, but was
|
* EVAS_ALLOC_ERROR_RECOVERED means that an allocation error occurred, but was
|
||||||
* recovered from by evas finding memory of its own it has allocated and
|
* recovered from by evas finding memory of its own it has allocated and
|
||||||
* freeing what it sees as not really usefully allocated memory. What is freed
|
* freeing what it sees as not really usefully allocated memory. What is freed
|
||||||
* may vary. Evas may reduce the resolution of images, free cached images or
|
* may vary. Evas may reduce the resolution of images, free cached images or
|
||||||
|
@ -66,14 +66,14 @@ evas_alloc_error(void)
|
||||||
return _evas_alloc_error;
|
return _evas_alloc_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* free cached items only in ram for speed reasons. return 0 if cant free */
|
/* free cached items only in ram for speed reasons. return 0 if can't free */
|
||||||
int
|
int
|
||||||
evas_mem_free(int mem_required __UNUSED__)
|
evas_mem_free(int mem_required __UNUSED__)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* start reducing quality of images etc. return 0 if cant free anything */
|
/* start reducing quality of images etc. return 0 if can't free anything */
|
||||||
int
|
int
|
||||||
evas_mem_degrade(int mem_required __UNUSED__)
|
evas_mem_degrade(int mem_required __UNUSED__)
|
||||||
{
|
{
|
||||||
|
|
|
@ -548,7 +548,7 @@ void evas_direct3d_image_draw(Direct3DDeviceHandler d3d, Direct3DImageHandler im
|
||||||
evas_cache_image_load_data(&evas_image->cache_entry);
|
evas_cache_image_load_data(&evas_image->cache_entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the image object wasnt initialized yet
|
// If the image object wasn't initialized yet
|
||||||
if (evas_image != NULL && evas_image->image.data != NULL && !image_ref->IsValid())
|
if (evas_image != NULL && evas_image->image.data != NULL && !image_ref->IsValid())
|
||||||
{
|
{
|
||||||
D3DImageCache::CacheEntryInfo info;
|
D3DImageCache::CacheEntryInfo info;
|
||||||
|
|
|
@ -59,7 +59,7 @@ FB_Mode *fb_list_modes(int *num_return);
|
||||||
/* be used. If refresh is 0 it uses the DEFAULT mode (the one with no */
|
/* be used. If refresh is 0 it uses the DEFAULT mode (the one with no */
|
||||||
/* refresh rate at the end of its name (WIDTHxHEIGHT-REFRESH) */
|
/* refresh rate at the end of its name (WIDTHxHEIGHT-REFRESH) */
|
||||||
/* NB: in 8bpp you get a 332 palette. This is fixed so all modes are */
|
/* NB: in 8bpp you get a 332 palette. This is fixed so all modes are */
|
||||||
/* "truecolor" - the onyl difference is how many bits bep red, green and */
|
/* "truecolor" - the only difference is how many bits bep red, green and */
|
||||||
/* blue channel. This is for speed reasons */
|
/* blue channel. This is for speed reasons */
|
||||||
FB_Mode *fb_setmode(int width, int height, int depth, int refresh);
|
FB_Mode *fb_setmode(int width, int height, int depth, int refresh);
|
||||||
/* returns the current fb mode being used in FB_Mode */
|
/* returns the current fb mode being used in FB_Mode */
|
||||||
|
|
|
@ -11,7 +11,7 @@ evas_fb_outbuf_fb_init(void)
|
||||||
void
|
void
|
||||||
evas_fb_outbuf_fb_free(Outbuf *buf)
|
evas_fb_outbuf_fb_free(Outbuf *buf)
|
||||||
{
|
{
|
||||||
/* FIXME: impliment */
|
/* FIXME: implement */
|
||||||
WRN("destroying fb info.. not implemented!!!! WARNING. LEAK!");
|
WRN("destroying fb info.. not implemented!!!! WARNING. LEAK!");
|
||||||
if (buf->priv.back_buf)
|
if (buf->priv.back_buf)
|
||||||
evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
|
evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
|
||||||
|
@ -122,7 +122,7 @@ evas_fb_outbuf_fb_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_
|
||||||
{
|
{
|
||||||
if (buf->priv.fb.fb)
|
if (buf->priv.fb.fb)
|
||||||
{
|
{
|
||||||
/* FIXME: need to impliment an fb call for "copy area" */
|
/* FIXME: need to implement an fb call for "copy area" */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -335,7 +335,7 @@ evas_fb_outbuf_fb_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth d
|
||||||
}
|
}
|
||||||
if (buf->priv.fb.fb)
|
if (buf->priv.fb.fb)
|
||||||
{
|
{
|
||||||
/* FIXME: impliment this */
|
/* FIXME: implement this */
|
||||||
}
|
}
|
||||||
/* if backbuf delet it */
|
/* if backbuf delet it */
|
||||||
/* resize window or reset fb mode */
|
/* resize window or reset fb mode */
|
||||||
|
|
|
@ -654,7 +654,7 @@ eng_output_flush(void *data)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// FIXME: this doesnt work.. why oh why?
|
// FIXME: this doesn't work.. why oh why?
|
||||||
int sx, sy, sw, sh;
|
int sx, sy, sw, sh;
|
||||||
|
|
||||||
// fimxe - reset when done
|
// fimxe - reset when done
|
||||||
|
|
|
@ -686,7 +686,7 @@ evas_engine_sdl16_image_data_get(void *data __UNUSED__, void *image,
|
||||||
eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_alone(&eim->cache_entry,
|
eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_alone(&eim->cache_entry,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
/* FIXME: Handle colorspace convertion correctly. */
|
/* FIXME: Handle colorspace conversion correctly. */
|
||||||
if (image_data) *image_data = (DATA32 *) im->pixels;
|
if (image_data) *image_data = (DATA32 *) im->pixels;
|
||||||
|
|
||||||
return eim;
|
return eim;
|
||||||
|
@ -703,7 +703,7 @@ evas_engine_sdl16_image_data_put(void *data, void *image, DATA32* image_data)
|
||||||
if (!eim) return NULL;
|
if (!eim) return NULL;
|
||||||
im = (Soft16_Image *) eim->cache_entry.src;
|
im = (Soft16_Image *) eim->cache_entry.src;
|
||||||
|
|
||||||
/* FIXME: Handle colorspace convertion correctly. */
|
/* FIXME: Handle colorspace conversion correctly. */
|
||||||
if ((DATA16 *) image_data == im->pixels) return eim;
|
if ((DATA16 *) image_data == im->pixels) return eim;
|
||||||
|
|
||||||
eim_new = (SDL_Engine_Image_Entry *) evas_cache_engine_image_data(re->cache,
|
eim_new = (SDL_Engine_Image_Entry *) evas_cache_engine_image_data(re->cache,
|
||||||
|
|
|
@ -891,8 +891,8 @@ static Evas_Func func =
|
||||||
eng_image_map4_draw,
|
eng_image_map4_draw,
|
||||||
eng_image_map_surface_new,
|
eng_image_map_surface_new,
|
||||||
eng_image_map_surface_free,
|
eng_image_map_surface_free,
|
||||||
NULL, // eng_image_content_hint_set - software doesnt use it
|
NULL, // eng_image_content_hint_set - software doesn't use it
|
||||||
NULL // eng_image_content_hint_get - software doesnt use it
|
NULL // eng_image_content_hint_get - software doesn't use it
|
||||||
/* FUTURE software generic calls go here */
|
/* FUTURE software generic calls go here */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -574,7 +574,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
|
||||||
if (fread(&g, 1, 1, f) != 1) goto close_file;
|
if (fread(&g, 1, 1, f) != 1) goto close_file;
|
||||||
if (fread(&r, 1, 1, f) != 1) goto close_file;
|
if (fread(&r, 1, 1, f) != 1) goto close_file;
|
||||||
if ((head_size != 12) /*&& (palette_size != 0)*/)
|
if ((head_size != 12) /*&& (palette_size != 0)*/)
|
||||||
{ // OS/2 V1 doesnt do the pad byte
|
{ // OS/2 V1 doesn't do the pad byte
|
||||||
if (fread(&a, 1, 1, f) != 1) goto close_file;
|
if (fread(&a, 1, 1, f) != 1) goto close_file;
|
||||||
}
|
}
|
||||||
a = 0xff; // fillin a as solid for paletted images
|
a = 0xff; // fillin a as solid for paletted images
|
||||||
|
|
|
@ -98,7 +98,7 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key
|
||||||
footer = (tga_footer *)(filedata + (ss.st_size - sizeof(tga_footer)));
|
footer = (tga_footer *)(filedata + (ss.st_size - sizeof(tga_footer)));
|
||||||
if (!memcmp(footer->signature, TGA_SIGNATURE, sizeof(footer->signature)))
|
if (!memcmp(footer->signature, TGA_SIGNATURE, sizeof(footer->signature)))
|
||||||
{
|
{
|
||||||
// footer is ther and matches. this is a tga file - any problems now
|
// footer is there and matches. this is a tga file - any problems now
|
||||||
// are a corrupt file
|
// are a corrupt file
|
||||||
*error = EVAS_LOAD_ERROR_CORRUPT_FILE;
|
*error = EVAS_LOAD_ERROR_CORRUPT_FILE;
|
||||||
footer_present = 1;
|
footer_present = 1;
|
||||||
|
@ -175,7 +175,7 @@ evas_image_load_file_data_tga(Image_Entry *ie, const char *file, const char *key
|
||||||
footer = (tga_footer *)(filedata + (ss.st_size - sizeof(tga_footer)));
|
footer = (tga_footer *)(filedata + (ss.st_size - sizeof(tga_footer)));
|
||||||
if (!memcmp(footer->signature, TGA_SIGNATURE, sizeof(footer->signature)))
|
if (!memcmp(footer->signature, TGA_SIGNATURE, sizeof(footer->signature)))
|
||||||
{
|
{
|
||||||
// footer is ther and matches. this is a tga file - any problems now
|
// footer is there and matches. this is a tga file - any problems now
|
||||||
// are a corrupt file
|
// are a corrupt file
|
||||||
*error = EVAS_LOAD_ERROR_CORRUPT_FILE;
|
*error = EVAS_LOAD_ERROR_CORRUPT_FILE;
|
||||||
footer_present = 1;
|
footer_present = 1;
|
||||||
|
|
Loading…
Reference in New Issue