Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 8545 → Rev 8544

/contrib/C_Layer/INCLUDE/kolibri_libimg.h
1,15 → 1,8
/* Written by turbocat2001 (Logaev Maxim) */
 
#ifndef KOLIBRI_LIBIMG_H
#define KOLIBRI_LIBIMG_H
 
#include <stddef.h>
#include <stdbool.h>
 
extern int kolibri_libimg_init(void);
 
#define _stdcall __attribute__((__stdcall__))
 
//list of format id's
#define LIBIMG_FORMAT_BMP 1
#define LIBIMG_FORMAT_ICO 2
26,52 → 19,6
#define LIBIMG_FORMAT_XBM 13
#define LIBIMG_FORMAT_Z80 14
 
#pragma pack(push, 1)
typedef struct{
uint32_t Checksum; // ((Width ROL 16) OR Height) XOR Data[0] ; ignored so far
uint32_t Width;
uint32_t Height;
uint32_t Next;
uint32_t Previous;
uint32_t Type; // one of Image.bppN
uint32_t* Data;
uint32_t Palette; // used iff Type eq Image.bpp1, Image.bpp2, Image.bpp4 or Image.bpp8i
uint32_t Extended;
uint32_t Flags; // bitfield
uint32_t Delay; // used iff Image.IsAnimated is set in Flags
} Image;
#pragma pack(pop)
 
#define IMAGE_BPP8i 1 // indexed
#define IMAGE_BPP24 2
#define IMAGE_BPP32 3
#define IMAGE_BPP15 4
#define IMAGE_BPP16 5
#define IMAGE_BPP1 6
#define IMAGE_BPP8g 7 // grayscale
#define IMAGE_BPP2i 8
#define IMAGE_BPP4i 9
#define IMAGE_BPP8a 10
 
// scale type
#define LIBIMG_SCALE_NONE 0
#define LIBIMG_SCALE_INTEGER 1
#define LIBIMG_SCALE_TILE 2
#define LIBIMG_SCALE_STRETCH 3
#define LIBIMG_SCALE_FIT_BOTH LIBIMG_SCALE_STRETCH
#define LIBIMG_SCALE_FIT_MIN 4
#define LIBIMG_SCALE_FIT_RECT LIBIMG_SCALE_FIT_MIN
#define LIBIMG_SCALE_FIT_WIDTH 5
#define LIBIMG_SCALE_FIT_HEIGHT 6
#define LIBIMG_SCALE_FIT_MAX 7
 
// interpolation algorithm
#define LIBIMG_INTER_NONE 0 // use it with LIBIMG_SCALE_INTEGER, LIBIMG_SCALE_TILE, etc
#define LIBIMG_INTER_BILINEAR 1
#define LIBIMG_INTER_BICUBIC 2
#define LIBIMG_INTER_LANCZOS 3
#define LIBIMG_INTER_DEFAULT LIBIMG_INTER_BILINEAR
 
//error codes
#define LIBIMG_ERROR_OUT_OF_MEMORY 1
#define LIBIMG_ERROR_FORMAT 2
90,6 → 37,7
#define LIBIMG_ENCODE_DELETE_ALPHA 0x08
#define LIBIMG_ENCODE_FLUSH_ALPHA 0x10
 
 
#define FLIP_VERTICAL 0x01
#define FLIP_HORIZONTAL 0x02
 
99,28 → 47,18
#define ROTATE_90_CCW ROTATE_270_CW
#define ROTATE_270_CCW ROTATE_90_CW
 
extern Image* (*img_decode)(void* file_data, uint32_t size, uint32_t b_color) _stdcall;
extern Image* (*img_encode)(Image* img, uint32_t length, uint32_t option) _stdcall;
extern Image* (*img_create)(uint32_t width, uint32_t height, uint32_t type) _stdcall;
extern void (*img_to_rgb2)(Image* img, void *rgb_data) _stdcall;
extern Image* (*img_to_rgb)(Image* img) _stdcall;
extern bool (*img_flip)(Image* img, uint32_t flip) _stdcall;
extern bool (*img_flip_layer)(Image *img, uint32_t flip) _stdcall;
extern bool (*img_rotate)(Image *img, uint32_t rotate) _stdcall;
extern bool (*img_rotate_layer)(Image* data, uint32_t rotate) _stdcall;
extern void (*img_draw)(Image *img, uint32_t x, uint32_t y, uint32_t w, uint32_t h, uint32_t xoff, uint32_t yoff) _stdcall;
extern int32_t (*img_count)(Image *img) _stdcall;
extern bool (*img_destroy)(Image *img) _stdcall;
extern bool (*img_destroy_layer)(Image* img) _stdcall;
extern Image* (*img_blend)(Image* dst, Image* src, uint32_t out_x, uint32_t out_y, uint32_t in_x, uint32_t in_y, uint32_t width, uint32_t height) _stdcall;
extern Image* (*img_convert)(Image *src, Image *dst, uint32_t dst_type, uint32_t, uint32_t) _stdcall;
extern Image* (*img_resize_data)(Image *src, uint32_t width, uint32_t height) _stdcall;
extern Image* (*img_scale)(Image* src, uint32_t crop_x, uint32_t crop_y, uint32_t crop_width, uint32_t crop_height, Image* dst, uint32_t scale_type, uint32_t inter, uint32_t new_width, uint32_t new_height) _stdcall;
extern void* (*img_decode)(void *, uint32_t, uint32_t) __attribute__((__stdcall__));
extern void* (*img_encode)(void *, uint32_t, uint32_t) __attribute__((__stdcall__));
extern void* (*img_create)(uint32_t, uint32_t, uint32_t) __attribute__((__stdcall__));
extern void (*img_to_rgb2)(void *, void *) __attribute__((__stdcall__));
extern void* (*img_to_rgb)(void *) __attribute__((__stdcall__));
extern uint32_t (*img_flip)(void *, uint32_t) __attribute__((__stdcall__));
extern uint32_t (*img_flip_layer)(void *, uint32_t) __attribute__((__stdcall__));
extern uint32_t (*img_rotate)(void *, uint32_t) __attribute__((__stdcall__));
extern uint32_t (*img_rotate_layer)(void *, uint32_t) __attribute__((__stdcall__));
extern void (*img_draw)(void *, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t ) __attribute__((__stdcall__));
extern uint32_t (*img_count)(void *) __attribute__((__stdcall__));
extern uint32_t (*img_destroy)(void *) __attribute__((__stdcall__));
extern uint32_t (*img_destroy_layer)(void *) __attribute__((__stdcall__));
 
void img_fill_color(Image* img, uint32_t width, uint32_t height, uint32_t color){
for (uint32_t i = 0; i < width*height; i++) {
img->Data[i] = color;
}
}
 
#endif /* KOLIBRI_LIBIMG_H */
/contrib/C_Layer/ASM/loadlibimg.asm
45,13 → 45,14
img_flip_layer, 'img_flip_layer', \
img_rotate, 'img_rotate', \
img_rotate_layer, 'img_rotate_layer', \
img_draw, 'img_draw', \
img_blend, 'img_blend', \
img_convert, 'img_convert', \
img_resize_data, 'img_resize_data', \
img_scale, 'img_scale'
img_draw, 'img_draw'
public libimg_init as '_libimg_init'
; public img_is_img as '_img_is_img'
;public img_info as '_img_info'
;public img_from_file as '_img_from_file'
;public img_to_file as '_img_to_file'
;public img_from_rgb as '_img_from_rgb'
public img_to_rgb as '_img_to_rgb'
public img_to_rgb2 as '_img_to_rgb2'
public img_decode as '_img_decode'
60,12 → 61,10
public img_destroy as '_img_destroy'
public img_destroy_layer as '_img_destroy_layer'
public img_count as '_img_count'
;public img_lock_bits as '_img_lock_bits'
;public img_unlock_bits as '_img_unlock_bits'
public img_flip as '_img_flip'
public img_flip_layer as '_img_flip_layer'
public img_rotate as '_img_rotate'
public img_rotate_layer as '_img_rotate_layer'
public img_draw as '_img_draw'
public img_blend as '_img_blend'
public img_convert as '_img_convert'
public img_resize_data as '_img_resize_data'
public img_scale as '_img_scale'
/contrib/C_Layer/EXAMPLE/img_example/logo.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property
/contrib/C_Layer/EXAMPLE/img_example/main.c
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/contrib/C_Layer/EXAMPLE/img_example/Makefile
File deleted