Updated with upstream update
This commit is contained in:
@ -374,7 +374,7 @@ file_open_thumbnail (Pika *pika,
|
||||
{
|
||||
image = g_value_get_object (pika_value_array_index (return_vals, 1));
|
||||
|
||||
if (pika_value_array_length (return_vals) >= 3 &&
|
||||
if (pika_value_array_length (return_vals) >= 4 &&
|
||||
G_VALUE_HOLDS_INT (pika_value_array_index (return_vals, 2)) &&
|
||||
G_VALUE_HOLDS_INT (pika_value_array_index (return_vals, 3)))
|
||||
{
|
||||
@ -385,11 +385,11 @@ file_open_thumbnail (Pika *pika,
|
||||
MAX (0, g_value_get_int (pika_value_array_index (return_vals, 3)));
|
||||
|
||||
if (pika_value_array_length (return_vals) >= 5 &&
|
||||
G_VALUE_HOLDS_INT (pika_value_array_index (return_vals, 4)))
|
||||
G_VALUE_HOLDS_ENUM (pika_value_array_index (return_vals, 4)))
|
||||
{
|
||||
gint value = g_value_get_int (pika_value_array_index (return_vals, 4));
|
||||
PikaImageType itype = g_value_get_enum (pika_value_array_index (return_vals, 4));
|
||||
|
||||
switch (value)
|
||||
switch (itype)
|
||||
{
|
||||
case PIKA_RGB_IMAGE:
|
||||
*format = pika_babl_format (PIKA_RGB,
|
||||
@ -424,7 +424,7 @@ file_open_thumbnail (Pika *pika,
|
||||
babl_new_palette ("-pika-indexed-format-dummy",
|
||||
&rgb, &rgba);
|
||||
|
||||
if (value == PIKA_INDEXED_IMAGE)
|
||||
if (itype == PIKA_INDEXED_IMAGE)
|
||||
*format = rgb;
|
||||
else
|
||||
*format = rgba;
|
||||
|
Reference in New Issue
Block a user