1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
|
From: Sergei Golovan
Subject: Patch introduces Blt_SetPictureInfo() and Blt_UnsetPictureInfo()
into the BLT stubs table. Otherwise, PictJpg30.so cannot be built with
stubs, and complains about missing symbols.
Date: Fri, 06 Jun 2025 17:18:05 +0300
Forwarded: yes
Bug: https://sourceforge.net/p/blt/patches/39/
--- a/src/bltPictFmts.h
+++ b/src/bltPictFmts.h
@@ -101,6 +101,7 @@
typedef int (Blt_PictureExportProc)(Tcl_Interp *interp, int index,
Blt_Chain chain, int objc, Tcl_Obj *const *objv);
+#ifndef USE_BLT_STUBS
BLT_EXTERN int Blt_PictureRegisterFormat(Tcl_Interp *interp,
const char *name,
Blt_PictureIsFmtProc *isFmtProc,
@@ -113,6 +114,7 @@
BLT_EXTERN int Blt_SetPictureInfo(Tcl_Interp *interp, const char *fieldName,
Tcl_Obj *valueObjPtr);
BLT_EXTERN int Blt_UnsetPictureInfo(Tcl_Interp *interp, const char *fieldName);
+#endif
typedef struct {
const char *name; /* Name of format. */
@@ -125,7 +127,9 @@
Blt_PictureExportProc *exportProc;
} Blt_PictFormat;
+#ifndef USE_BLT_STUBS
BLT_EXTERN Blt_PictFormat *Blt_FindPictureFormat(Tcl_Interp *interp,
const char *ext);
+#endif
#endif /* _BLT_PIC_FMTS_H */
--- a/src/bltTkProcs.h
+++ b/src/bltTkProcs.h
@@ -589,6 +589,17 @@
BLT_EXTERN Blt_PictFormat * Blt_FindPictureFormat(Tcl_Interp *interp,
const char *ext);
#endif
+#ifndef Blt_SetPictureInfo_DECLARED
+#define Blt_SetPictureInfo_DECLARED
+/* 97 */
+BLT_EXTERN int Blt_SetPictureInfo(Tcl_Interp *interp, const char *fieldName,
+ Tcl_Obj *valueObjPtr);
+#endif
+#ifndef Blt_UnsetPictureInfo_DECLARED
+#define Blt_UnsetPictureInfo_DECLARED
+/* 98 */
+BLT_EXTERN int Blt_UnsetPictureInfo(Tcl_Interp *interp, const char *fieldName);
+#endif
typedef struct BltTkStubHooks {
struct BltTkIntProcs *bltTkIntProcs;
@@ -695,6 +706,8 @@
int (*blt_PictureRegisterFormat) (Tcl_Interp *interp, const char *name, Blt_PictureIsFmtProc *isFmtProc, Blt_PictureReadProc *readProc, Blt_PictureWriteProc *writeProc, Blt_PictureImportProc *importProc, Blt_PictureExportProc *exportProc); /* 94 */
Blt_Picture (*blt_GetNthPicture) (Blt_Chain chain, size_t index); /* 95 */
Blt_PictFormat * (*blt_FindPictureFormat) (Tcl_Interp *interp, const char *ext); /* 96 */
+ int (*blt_SetPictureInfo) (Tcl_Interp *interp, const char *fieldName, Tcl_Obj *valueObjPtr); /* 97 */
+ int (*blt_UnsetPictureInfo) (Tcl_Interp *interp, const char *fieldName); /* 98 */
} BltTkProcs;
#ifdef __cplusplus
@@ -1096,6 +1109,14 @@
#define Blt_FindPictureFormat \
(bltTkProcsPtr->blt_FindPictureFormat) /* 96 */
#endif
+#ifndef Blt_SetPictureInfo
+#define Blt_SetPictureInfo \
+ (bltTkProcsPtr->blt_SetPictureInfo) /* 97 */
+#endif
+#ifndef Blt_UnsetPictureInfo
+#define Blt_UnsetPictureInfo \
+ (bltTkProcsPtr->blt_UnsetPictureInfo) /* 98 */
+#endif
#endif /* defined(USE_BLT_STUBS) && !defined(BUILD_BLT_TK_PROCS) */
--- a/src/bltTkProcs.c
+++ b/src/bltTkProcs.c
@@ -110,6 +110,8 @@
Blt_PictureRegisterFormat, /* 94 */
Blt_GetNthPicture, /* 95 */
Blt_FindPictureFormat, /* 96 */
+ Blt_SetPictureInfo, /* 97 */
+ Blt_UnsetPictureInfo, /* 98 */
};
/* !END!: Do not edit above this line. */
|