| 1 |
jlec 10/02/06 23:22:51 |
| 2 |
|
| 3 |
Added: 1.0.4-tk.patch |
| 4 |
Log: |
| 5 |
Splitted imosflm from ccp4 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/imosflm/files/1.0.4-tk.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/imosflm/files/1.0.4-tk.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/imosflm/files/1.0.4-tk.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 1.0.4-tk.patch |
| 15 |
=================================================================== |
| 16 |
--- c/tkImageLoad.c 2009-08-14 21:10:19.000000000 +0200 |
| 17 |
+++ c/tkImageLoad.c.new 2009-08-14 21:10:55.000000000 +0200 |
| 18 |
@@ -19,6 +19,7 @@ |
| 19 |
//#define BLOCKED 1 |
| 20 |
//#define UNBLOCKED 1 |
| 21 |
#define IN_BLOCK_FLIP 1 |
| 22 |
+#define USE_COMPOSITELESS_PHOTO_PUT_BLOCK |
| 23 |
|
| 24 |
/* *********************************************************************/ |
| 25 |
|
| 26 |
--- c/tkImageLoad.c 2009-08-14 21:13:29.000000000 +0200 |
| 27 |
+++ c/tkImageLoad.c.new 2009-08-14 21:14:59.000000000 +0200 |
| 28 |
@@ -272,9 +272,11 @@ |
| 29 |
} |
| 30 |
/* put the photo block into the image */ |
| 31 |
#ifdef __alpha |
| 32 |
- Tk_PhotoPutBlock(dp, &db, 0, 0, width, height); |
| 33 |
+ Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, |
| 34 |
+ TK_PHOTO_COMPOSITE_OVERLAY); |
| 35 |
#else |
| 36 |
- Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET); |
| 37 |
+ Tk_PhotoPutBlock(dp, &db, 0, 0, width, height, TK_PHOTO_COMPOSITE_SET, |
| 38 |
+ TK_PHOTO_COMPOSITE_OVERLAY); |
| 39 |
#endif |
| 40 |
|
| 41 |
/* Free the photo block's memory now it is finished with */ |
| 42 |
@@ -417,9 +419,11 @@ |
| 43 |
|
| 44 |
/* put the photo block back into the image */ |
| 45 |
#ifdef __alpha |
| 46 |
- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height); |
| 47 |
+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height, |
| 48 |
+ TK_PHOTO_COMPOSITE_OVERLAY); |
| 49 |
#else |
| 50 |
- Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET); |
| 51 |
+ Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height,TK_PHOTO_COMPOSITE_SET, |
| 52 |
+ TK_PHOTO_COMPOSITE_OVERLAY); |
| 53 |
#endif |
| 54 |
/* Free the photo block's memory now it is finished with */ |
| 55 |
if (block.pixelPtr) { |
| 56 |
--- c/tkImageLoad.c 2009-08-14 21:15:06.000000000 +0200 |
| 57 |
+++ c/tkImageLoad.c.new 2009-08-14 21:16:53.000000000 +0200 |
| 58 |
@@ -9,6 +9,7 @@ |
| 59 |
\************************************************************************/ |
| 60 |
|
| 61 |
#include <stdio.h> |
| 62 |
+#include <string.h> |
| 63 |
#include <tcl.h> |
| 64 |
#include <tk.h> |
| 65 |
#include <assert.h> |
Archives