Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
pixmap.c
Log Message:
Mon Apr 18 22:11:22 2005 Michael Jennings (mej)
Patch from C. David Wilde <[EMAIL PROTECTED]> to correct the non-MMX
color modifier routines.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- pixmap.c 19 Apr 2005 01:57:20 -0000 1.104
+++ pixmap.c 19 Apr 2005 02:13:19 -0000 1.105
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: pixmap.c,v 1.104 2005/04/19 01:57:20 mej
Exp $";
+static const char cvs_ident[] = "$Id: pixmap.c,v 1.105 2005/04/19 02:13:19 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -1649,12 +1649,12 @@
int r, g, b;
# ifdef WORDS_BIGENDIAN
- r = (ptr[x + 1] * rm) >> 8;
- g = (ptr[x + 2] * gm) >> 8;
- b = (ptr[x + 3] * bm) >> 8;
- ptr[x + 1] = r;
- ptr[x + 2] = g;
- ptr[x + 3] = b;
+ r = (ptr[x + 6] * rm) >> 8;
+ g = (ptr[x + 5] * gm) >> 8;
+ b = (ptr[x + 4] * bm) >> 8;
+ ptr[x + 6] = r;
+ ptr[x + 5] = g;
+ ptr[x + 4] = b;
# else
r = (ptr[x + 2] * rm) >> 8;
g = (ptr[x + 1] * gm) >> 8;
@@ -1672,9 +1672,9 @@
int r, g, b;
# ifdef WORDS_BIGENDIAN
- r = (ptr[x + 1] * rm) >> 8;
- g = (ptr[x + 2] * gm) >> 8;
- b = (ptr[x + 3] * bm) >> 8;
+ r = (ptr[x + 6] * rm) >> 8;
+ g = (ptr[x + 5] * gm) >> 8;
+ b = (ptr[x + 4] * bm) >> 8;
# else
r = (ptr[x + 2] * rm) >> 8;
g = (ptr[x + 1] * gm) >> 8;
@@ -1684,9 +1684,9 @@
g |= (!(g >> 8) - 1);
b |= (!(b >> 8) - 1);
# ifdef WORDS_BIGENDIAN
- ptr[x + 1] = r;
- ptr[x + 2] = g;
- ptr[x + 3] = b;
+ ptr[x + 6] = r;
+ ptr[x + 5] = g;
+ ptr[x + 4] = b;
# else
ptr[x + 2] = r;
ptr[x + 1] = g;
@@ -1874,27 +1874,34 @@
switch (real_depth) {
case 15:
#ifdef HAVE_MMX
+ D_PIXMAP(("Using MMX - 15 bit\n"));
shade_ximage_15_mmx(ximg->data, ximg->bytes_per_line, w, h,
rm, gm, bm);
#else
+ D_PIXMAP(("No MMX Found - 15 bit\n"));
shade_ximage_15(ximg->data, ximg->bytes_per_line, w, h, rm,
gm, bm);
#endif
break;
case 16:
#ifdef HAVE_MMX
+ D_PIXMAP(("Using MMX - 16 bit\n"));
shade_ximage_16_mmx(ximg->data, ximg->bytes_per_line, w, h,
rm, gm, bm);
#else
+ D_PIXMAP(("No MMX Found - 16 bit\n"));
shade_ximage_16(ximg->data, ximg->bytes_per_line, w, h, rm,
gm, bm);
#endif
break;
case 24:
if (ximg->bits_per_pixel != 32) {
+ D_PIXMAP(("Rendering 24 bit\n"));
shade_ximage_24(ximg->data, ximg->bytes_per_line, w, h,
rm, gm, bm);
}
/* drop */
case 32:
#ifdef HAVE_MMX
+ D_PIXMAP(("Using MMX - 32 bit\n"));
shade_ximage_32_mmx(ximg->data, ximg->bytes_per_line, w, h,
rm, gm, bm);
#else
+ D_PIXMAP(("No MMX Found - 32 bit\n"));
shade_ximage_32(ximg->data, ximg->bytes_per_line, w, h, rm,
gm, bm);
#endif
break;
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
