summaryrefslogtreecommitdiff
path: root/core/fxcodec
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcodec')
-rw-r--r--core/fxcodec/codec/ccodec_bmpmodule.cpp2
-rw-r--r--core/fxcodec/codec/ccodec_bmpmodule.h2
-rw-r--r--core/fxcodec/codec/ccodec_gifmodule.cpp2
-rw-r--r--core/fxcodec/codec/ccodec_gifmodule.h2
-rw-r--r--core/fxcodec/codec/ccodec_pngmodule.cpp4
-rw-r--r--core/fxcodec/codec/ccodec_pngmodule.h2
-rw-r--r--core/fxcodec/codec/ccodec_tiffmodule.cpp2
-rw-r--r--core/fxcodec/lbmp/fx_bmp.cpp2
-rw-r--r--core/fxcodec/lbmp/fx_bmp.h6
-rw-r--r--core/fxcodec/lgif/fx_gif.cpp10
-rw-r--r--core/fxcodec/lgif/fx_gif.h12
11 files changed, 23 insertions, 23 deletions
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp
index 9d64199501..f237b14448 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.cpp
+++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp
@@ -27,7 +27,7 @@ static void bmp_free_func(void* p) {
}
};
static void bmp_error_data(bmp_decompress_struct_p bmp_ptr,
- const FX_CHAR* err_msg) {
+ const char* err_msg) {
FXSYS_strncpy((char*)bmp_ptr->err_ptr, err_msg, BMP_MAX_ERROR_SIZE - 1);
longjmp(bmp_ptr->jmpbuf, 1);
}
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.h b/core/fxcodec/codec/ccodec_bmpmodule.h
index 11d5931cac..d07d9850c6 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.h
+++ b/core/fxcodec/codec/ccodec_bmpmodule.h
@@ -33,7 +33,7 @@ class CCodec_BmpModule : public ICodec_BmpModule {
int32_t LoadImage(FXBMP_Context* pContext) override;
protected:
- FX_CHAR m_szLastError[256];
+ char m_szLastError[256];
};
#endif // CORE_FXCODEC_CODEC_CCODEC_BMPMODULE_H_
diff --git a/core/fxcodec/codec/ccodec_gifmodule.cpp b/core/fxcodec/codec/ccodec_gifmodule.cpp
index a85bc5eddc..91c64a06a1 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.cpp
+++ b/core/fxcodec/codec/ccodec_gifmodule.cpp
@@ -29,7 +29,7 @@ static void gif_free_func(void* p) {
};
static void gif_error_data(gif_decompress_struct_p gif_ptr,
- const FX_CHAR* err_msg) {
+ const char* err_msg) {
FXSYS_strncpy((char*)gif_ptr->err_ptr, err_msg, GIF_MAX_ERROR_SIZE - 1);
longjmp(gif_ptr->jmpbuf, 1);
}
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h
index 7721d7a767..6830064d43 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.h
+++ b/core/fxcodec/codec/ccodec_gifmodule.h
@@ -39,7 +39,7 @@ class CCodec_GifModule : public ICodec_GifModule {
CFX_DIBAttribute* pAttribute) override;
protected:
- FX_CHAR m_szLastError[256];
+ char m_szLastError[256];
};
#endif // CORE_FXCODEC_CODEC_CCODEC_GIFMODULE_H_
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp
index 028513b729..4bd4cfce93 100644
--- a/core/fxcodec/codec/ccodec_pngmodule.cpp
+++ b/core/fxcodec/codec/ccodec_pngmodule.cpp
@@ -57,7 +57,7 @@ static void _png_load_bmp_attribute(png_structp png_ptr,
png_get_tIME(png_ptr, info_ptr, &t);
if (t) {
FXSYS_memset(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));
- FXSYS_snprintf((FX_CHAR*)pAttribute->m_strTime,
+ FXSYS_snprintf((char*)pAttribute->m_strTime,
sizeof(pAttribute->m_strTime), "%4u:%2u:%2u %2u:%2u:%2u",
t->year, t->month, t->day, t->hour, t->minute, t->second);
pAttribute->m_strTime[sizeof(pAttribute->m_strTime) - 1] = 0;
@@ -67,7 +67,7 @@ static void _png_load_bmp_attribute(png_structp png_ptr,
#if defined(PNG_TEXT_SUPPORTED)
int i;
FX_STRSIZE len;
- const FX_CHAR* buf;
+ const char* buf;
int num_text;
png_textp text = nullptr;
png_get_text(png_ptr, info_ptr, &text, &num_text);
diff --git a/core/fxcodec/codec/ccodec_pngmodule.h b/core/fxcodec/codec/ccodec_pngmodule.h
index 1f3a3d96cc..0ca33f03c6 100644
--- a/core/fxcodec/codec/ccodec_pngmodule.h
+++ b/core/fxcodec/codec/ccodec_pngmodule.h
@@ -25,7 +25,7 @@ class CCodec_PngModule : public ICodec_PngModule {
CFX_DIBAttribute* pAttribute) override;
protected:
- FX_CHAR m_szLastError[PNG_ERROR_SIZE];
+ char m_szLastError[PNG_ERROR_SIZE];
};
#endif // CORE_FXCODEC_CODEC_CCODEC_PNGMODULE_H_
diff --git a/core/fxcodec/codec/ccodec_tiffmodule.cpp b/core/fxcodec/codec/ccodec_tiffmodule.cpp
index 736772892a..3d7db88b18 100644
--- a/core/fxcodec/codec/ccodec_tiffmodule.cpp
+++ b/core/fxcodec/codec/ccodec_tiffmodule.cpp
@@ -193,7 +193,7 @@ bool Tiff_Exif_GetInfo(TIFF* tif_ctx, ttag_t tag, CFX_DIBAttribute* pAttr) {
void Tiff_Exif_GetStringInfo(TIFF* tif_ctx,
ttag_t tag,
CFX_DIBAttribute* pAttr) {
- FX_CHAR* buf = nullptr;
+ char* buf = nullptr;
TIFFGetField(tif_ctx, tag, &buf);
if (!buf)
return;
diff --git a/core/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/lbmp/fx_bmp.cpp
index 6d4fb51fcd..c31886dcfd 100644
--- a/core/fxcodec/lbmp/fx_bmp.cpp
+++ b/core/fxcodec/lbmp/fx_bmp.cpp
@@ -34,7 +34,7 @@ void SetWord_LSBFirst(uint8_t* p, uint16_t v) {
p[0] = (uint8_t)v;
p[1] = (uint8_t)(v >> 8);
}
-void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg) {
+void bmp_error(bmp_decompress_struct_p bmp_ptr, const char* err_msg) {
if (bmp_ptr && bmp_ptr->bmp_error_fn) {
bmp_ptr->bmp_error_fn(bmp_ptr, err_msg);
}
diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h
index b0233d1ef0..5d1f799fd1 100644
--- a/core/fxcodec/lbmp/fx_bmp.h
+++ b/core/fxcodec/lbmp/fx_bmp.h
@@ -70,8 +70,8 @@ typedef bmp_decompress_struct* bmp_decompress_struct_p;
typedef bmp_decompress_struct_p* bmp_decompress_struct_pp;
struct tag_bmp_decompress_struct {
jmp_buf jmpbuf;
- FX_CHAR* err_ptr;
- void (*bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
+ char* err_ptr;
+ void (*bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const char* err_msg);
void* context_ptr;
@@ -111,7 +111,7 @@ struct tag_bmp_decompress_struct {
uint32_t skip_size;
int32_t decode_status;
};
-void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg);
+void bmp_error(bmp_decompress_struct_p bmp_ptr, const char* err_msg);
bmp_decompress_struct_p bmp_create_decompress();
void bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr);
int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr);
diff --git a/core/fxcodec/lgif/fx_gif.cpp b/core/fxcodec/lgif/fx_gif.cpp
index d62dacb36c..c4661b0acd 100644
--- a/core/fxcodec/lgif/fx_gif.cpp
+++ b/core/fxcodec/lgif/fx_gif.cpp
@@ -18,7 +18,7 @@ uint32_t CGifLZWDecoder::GetAvailInput() {
return avail_in;
}
-CGifLZWDecoder::CGifLZWDecoder(FX_CHAR* error_ptr)
+CGifLZWDecoder::CGifLZWDecoder(char* error_ptr)
: code_size(0),
code_size_cur(0),
code_clear(0),
@@ -506,12 +506,12 @@ void gif_destroy_compress(gif_compress_struct_pp gif_ptr_ptr) {
FX_Free(gif_ptr->pte_ptr);
FX_Free(gif_ptr);
}
-void gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg) {
+void gif_error(gif_decompress_struct_p gif_ptr, const char* err_msg) {
if (gif_ptr && gif_ptr->gif_error_fn) {
gif_ptr->gif_error_fn(gif_ptr, err_msg);
}
}
-void gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg) {}
+void gif_warn(gif_decompress_struct_p gif_ptr, const char* err_msg) {}
int32_t gif_read_header(gif_decompress_struct_p gif_ptr) {
if (!gif_ptr)
return 0;
@@ -680,7 +680,7 @@ int32_t gif_decode_extension(gif_decompress_struct_p gif_ptr) {
return 2;
}
*(gif_ptr->cmt_data_ptr) +=
- CFX_ByteString((const FX_CHAR*)data_ptr, data_size);
+ CFX_ByteString((const char*)data_ptr, data_size);
}
} break;
case GIF_D_STATUS_EXT_PTE: {
@@ -731,7 +731,7 @@ int32_t gif_decode_extension(gif_decompress_struct_p gif_ptr) {
return 2;
}
*(gif_pt_ptr->string_ptr) +=
- CFX_ByteString((const FX_CHAR*)data_ptr, data_size);
+ CFX_ByteString((const char*)data_ptr, data_size);
}
gif_ptr->pt_ptr_arr_ptr->push_back(gif_pt_ptr);
} break;
diff --git a/core/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h
index a8b780b099..5027c447d5 100644
--- a/core/fxcodec/lgif/fx_gif.h
+++ b/core/fxcodec/lgif/fx_gif.h
@@ -122,7 +122,7 @@ class CGifLZWDecoder {
uint8_t suffix;
};
- explicit CGifLZWDecoder(FX_CHAR* error_ptr);
+ explicit CGifLZWDecoder(char* error_ptr);
~CGifLZWDecoder();
void InitTable(uint8_t code_len);
@@ -152,7 +152,7 @@ class CGifLZWDecoder {
uint8_t bits_left;
uint32_t code_store;
- FX_CHAR* err_msg_ptr;
+ char* err_msg_ptr;
};
class CGifLZWEncoder {
@@ -208,8 +208,8 @@ typedef gif_decompress_struct_p* gif_decompress_struct_pp;
static const int32_t s_gif_interlace_step[4] = {8, 8, 4, 2};
struct tag_gif_decompress_struct {
jmp_buf jmpbuf;
- FX_CHAR* err_ptr;
- void (*gif_error_fn)(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
+ char* err_ptr;
+ void (*gif_error_fn)(gif_decompress_struct_p gif_ptr, const char* err_msg);
void* context_ptr;
int width;
int height;
@@ -280,8 +280,8 @@ struct tag_gif_compress_struct {
uint32_t pte_data_len;
};
-void gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
-void gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
+void gif_error(gif_decompress_struct_p gif_ptr, const char* err_msg);
+void gif_warn(gif_decompress_struct_p gif_ptr, const char* err_msg);
gif_decompress_struct_p gif_create_decompress();
void gif_destroy_decompress(gif_decompress_struct_pp gif_ptr_ptr);
gif_compress_struct_p gif_create_compress();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:06:44 +0000