fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 00:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed XrFormatRGB32 to XrFormatRGB24

Browse source
This commit is contained in:
Carl Worth 2003-05-02 14:07:41 +00:00
parent 9c814d23d6
commit 292d7bd9ba
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-05-02 Carl Worth <cworth@east.isi.edu>
* src/Xr.h: Changed XrFormatRGB32 to XrFormatRGB24
* src/xrsurface.c (_XrFormatBPP, XrSurfaceCreateForImage)
(_XrFormatDepth): Fixed for change of XrFormatRGB32 to
XrFormatRGB24
2003-05-01 Carl Worth <cworth@isi.edu>
* src/xrpath.c (_XrPathBounderInit):

2
src/Makefile.am
View file

@ -22,6 +22,6 @@ libXr_la_SOURCES = \
libXr_la_LDFLAGS = -version-info @VERSION_INFO@
INCLUDES = $(X_CFLAGS) $(XR_CFLAGS)
INCLUDES = $(XR_CFLAGS) $(X_CFLAGS)
libXr_la_LIBADD = $(XR_LIBS)

2
src/Xr.h
View file

@ -60,7 +60,7 @@ XrSetTargetSurface (XrState *xrs, XrSurface *surface);
typedef enum _XrFormat {
XrFormatARGB32 = PictStandardARGB32,
XrFormatRGB32 = PictStandardRGB24,
XrFormatRGB24 = PictStandardRGB24,
XrFormatA8 = PictStandardA8,
XrFormatA1 = PictStandardA1
} XrFormat;

7
src/xrsurface.c
View file

@ -93,8 +93,8 @@ _XrFormatBPP (XrFormat format)
case XrFormatA8:
return 8;
break;
case XrFormatRGB24:
case XrFormatARGB32:
case XrFormatRGB32:
default:
return 32;
break;
@ -119,7 +119,7 @@ XrSurfaceCreateForImage (char *data,
IcFormatInit (&icformat, PICT_a8r8g8b8);
bpp = 32;
break;
case XrFormatRGB32:
case XrFormatRGB24:
IcFormatInit (&icformat, PICT_x8r8g8b8);
bpp = 32;
break;
@ -173,8 +173,9 @@ _XrFormatDepth (XrFormat format)
return 1;
case XrFormatA8:
return 8;
case XrFormatRGB24:
return 24;
case XrFormatARGB32:
case XrFormatRGB32:
default:
return 32;
}