Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
32924617
by Alexei Podtelezhnikov at 2021-11-24T22:36:05-05:00
1 changed file:
Changes:
| ... | ... | @@ -248,15 +248,6 @@ blit_funcs[GBLENDER_TARGET_MAX] = |
| 248 | 248 |
};
|
| 249 | 249 |
|
| 250 | 250 |
|
| 251 |
-static void
|
|
| 252 |
-_gblender_blit_dummy( GBlenderBlit blit,
|
|
| 253 |
- grColor color )
|
|
| 254 |
-{
|
|
| 255 |
- (void)blit;
|
|
| 256 |
- (void)color;
|
|
| 257 |
-}
|
|
| 258 |
- |
|
| 259 |
- |
|
| 260 | 251 |
static int
|
| 261 | 252 |
gblender_blit_init( GBlenderBlit blit,
|
| 262 | 253 |
int dst_x,
|
| ... | ... | @@ -308,6 +299,7 @@ gblender_blit_init( GBlenderBlit blit, |
| 308 | 299 |
case gr_pixel_mode_mono: src_format = GBLENDER_SOURCE_MONO;
|
| 309 | 300 |
break;
|
| 310 | 301 |
default:
|
| 302 |
+ grError = gr_err_bad_source_depth;
|
|
| 311 | 303 |
return -2;
|
| 312 | 304 |
}
|
| 313 | 305 |
|
| ... | ... | @@ -319,20 +311,13 @@ gblender_blit_init( GBlenderBlit blit, |
| 319 | 311 |
case gr_pixel_mode_rgb565: dst_format = GBLENDER_TARGET_RGB565; break;
|
| 320 | 312 |
case gr_pixel_mode_rgb555: dst_format = GBLENDER_TARGET_RGB555; break;
|
| 321 | 313 |
default:
|
| 314 |
+ grError = gr_err_bad_target_depth;
|
|
| 322 | 315 |
return -2;
|
| 323 | 316 |
}
|
| 324 | 317 |
|
| 325 | 318 |
blit->blender = surface->gblender;
|
| 326 | 319 |
blit->blit_func = blit_funcs[dst_format][src_format];
|
| 327 | 320 |
|
| 328 |
- if ( blit->blit_func == 0 )
|
|
| 329 |
- {
|
|
| 330 |
- /* unsupported blit mode
|
|
| 331 |
- */
|
|
| 332 |
- blit->blit_func = _gblender_blit_dummy;
|
|
| 333 |
- return -2;
|
|
| 334 |
- }
|
|
| 335 |
- |
|
| 336 | 321 |
if ( dst_x < 0 )
|
| 337 | 322 |
{
|
| 338 | 323 |
src_width += dst_x;
|
| ... | ... | @@ -358,10 +343,7 @@ gblender_blit_init( GBlenderBlit blit, |
| 358 | 343 |
/* nothing to blit
|
| 359 | 344 |
*/
|
| 360 | 345 |
if ( src_width <= 0 || src_height <= 0 )
|
| 361 |
- {
|
|
| 362 |
- blit->blit_func = _gblender_blit_dummy;
|
|
| 363 | 346 |
return -1;
|
| 364 |
- }
|
|
| 365 | 347 |
|
| 366 | 348 |
blit->width = src_width;
|
| 367 | 349 |
blit->height = src_height;
|