| … | |
… | |
| 97 | // zero_initialised-derived structs |
97 | // zero_initialised-derived structs |
| 98 | #ifdef HAVE_AFTERIMAGE |
98 | #ifdef HAVE_AFTERIMAGE |
| 99 | original_asim = NULL; |
99 | original_asim = NULL; |
| 100 | #endif |
100 | #endif |
| 101 | #ifdef BG_IMAGE_FROM_FILE |
101 | #ifdef BG_IMAGE_FROM_FILE |
|
|
102 | have_image = false; |
| 102 | h_scale = v_scale = 0; |
103 | h_scale = v_scale = 0; |
| 103 | h_align = v_align = 0; |
104 | h_align = v_align = 0; |
| 104 | #endif |
105 | #endif |
| 105 | flags = 0; |
106 | flags = 0; |
| 106 | pixmap = None; |
107 | pixmap = None; |
| … | |
… | |
| 127 | if (flags & isTransparent) |
128 | if (flags & isTransparent) |
| 128 | return true; |
129 | return true; |
| 129 | # endif |
130 | # endif |
| 130 | |
131 | |
| 131 | # ifdef BG_IMAGE_FROM_FILE |
132 | # ifdef BG_IMAGE_FROM_FILE |
| 132 | # ifdef HAVE_AFTERIMAGE |
133 | if (have_image) |
| 133 | if (original_asim) |
|
|
| 134 | # endif |
|
|
| 135 | { |
134 | { |
| 136 | if (h_scale != 0 || v_scale != 0 |
135 | if (h_scale != 0 || v_scale != 0 |
| 137 | || h_align != 0 || v_align != 0) |
136 | || h_align != 0 || v_align != 0) |
| 138 | return true; |
137 | return true; |
| 139 | } |
138 | } |
| … | |
… | |
| 149 | if (flags & isTransparent) |
148 | if (flags & isTransparent) |
| 150 | return true; |
149 | return true; |
| 151 | # endif |
150 | # endif |
| 152 | |
151 | |
| 153 | # ifdef BG_IMAGE_FROM_FILE |
152 | # ifdef BG_IMAGE_FROM_FILE |
| 154 | # ifdef HAVE_AFTERIMAGE |
153 | if (have_image) |
| 155 | if (original_asim) |
|
|
| 156 | # endif |
|
|
| 157 | { |
154 | { |
| 158 | if (h_align == rootAlign || v_align == rootAlign) |
155 | if (h_align == rootAlign || v_align == rootAlign) |
| 159 | return true; |
156 | return true; |
| 160 | } |
157 | } |
| 161 | # endif |
158 | # endif |
| … | |
… | |
| 725 | |
722 | |
| 726 | # ifdef HAVE_AFTERIMAGE |
723 | # ifdef HAVE_AFTERIMAGE |
| 727 | if (!target->asimman) |
724 | if (!target->asimman) |
| 728 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
725 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
| 729 | original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); |
726 | original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); |
| 730 | return original_asim; |
727 | if (original_asim) |
|
|
728 | have_image = true; |
|
|
729 | return have_image; |
| 731 | # endif |
730 | # endif |
| 732 | } |
731 | } |
| 733 | |
732 | |
| 734 | return false; |
733 | return false; |
| 735 | } |
734 | } |
