Skip to content

Commit 5638e70

Browse files
committed
fix macOS build
1 parent 77e36ff commit 5638e70

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
project(
2-
'vipsdisp', 'c',
1+
project('vipsdisp', 'c',
32
version: '3.1.0',
43
license: 'MIT',
54
meson_version: '>=0.56',
65
default_options: [
7-
'c_std=c11',
6+
# glib uses this, so we do too
7+
'c_std=gnu11',
88
# do a release (optimised) build by default
99
'buildtype=release',
1010
# turn off asserts etc. in release mode

src/imageui.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ imageui_set_property(GObject *object,
157157
{
158158
Imageui *imageui = (Imageui *) object;
159159

160+
double zoom;
161+
160162
#ifdef DEBUG_VERBOSE
161163
{
162164
g_autofree char *str = g_strdup_value_contents(value);
@@ -179,7 +181,7 @@ imageui_set_property(GObject *object,
179181
case PROP_ZOOM:
180182
/* Scale by the zoom factor (SVG etc. zoom) we picked on load.
181183
*/
182-
double zoom = g_value_get_double(value);
184+
zoom = g_value_get_double(value);
183185
zoom /= imageui->tilesource->zoom;
184186

185187
g_object_set(imageui->imagedisplay,
@@ -209,6 +211,8 @@ imageui_get_property(GObject *object,
209211
{
210212
Imageui *imageui = IMAGEUI(object);
211213

214+
double zoom;
215+
212216
switch (prop_id) {
213217
case PROP_TILESOURCE:
214218
g_value_set_object(value, imageui->tilesource);
@@ -220,8 +224,6 @@ imageui_get_property(GObject *object,
220224
break;
221225

222226
case PROP_ZOOM:
223-
double zoom;
224-
225227
g_object_get(imageui->imagedisplay,
226228
"zoom", &zoom,
227229
NULL);

src/tilesource.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ tilesource_set_property(GObject *object,
782782
int i;
783783
double d;
784784
gboolean b;
785+
TilesourceMode mode;
785786

786787
#ifdef DEBUG
787788
{
@@ -793,7 +794,7 @@ tilesource_set_property(GObject *object,
793794

794795
switch (prop_id) {
795796
case PROP_MODE:
796-
TilesourceMode mode = g_value_get_enum(value);
797+
mode = g_value_get_enum(value);
797798
if (mode >= 0 &&
798799
mode < TILESOURCE_MODE_LAST &&
799800
tilesource->mode != mode) {

0 commit comments

Comments
 (0)