dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gimp/plug-ins/file-dds/ddsread.c

1599 lines
55 KiB
C
Raw Normal View History

file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
/*
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
* DDS GIMP plugin
*
* Copyright (C) 2004-2012 Shawn Kirst <skirst@gmail.com>,
* with parts (C) 2003 Arne Reuter <homepage@arnereuter.de> where specified.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301, USA.
*/
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
/*
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
** !!! COPYRIGHT NOTICE !!!
**
** The following is based on code (C) 2003 Arne Reuter <homepage@arnereuter.de>
** URL: http://www.dr-reuter.de/arne/dds.html
**
*/
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: make file-dds compile. This is still very broken and it doesn't load well. But at least it compiles! All build errors (and a few warnings though not all) fixed.
2018-11-14 21:56:15 +08:00
#include "config.h"
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
#include <errno.h>
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
plug-ins: make file-dds compile. This is still very broken and it doesn't load well. But at least it compiles! All build errors (and a few warnings though not all) fixed.
2018-11-14 21:56:15 +08:00
#include <libgimp/stdplugins-intl.h>
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
#include "dds.h"
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
#include "ddsread.h"
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
#include "dxt.h"
plug-ins: in file-dds, rename endian.h to endian_rw.h ... ... to avoid clashing with the system <endian.h> Thanks Andrea!
2019-02-18 02:33:10 +08:00
#include "endian_rw.h"
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
#include "formats.h"
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
#include "imath.h"
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
#include "misc.h"
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/*
* Struct containing all info needed to parse the file.
* This can be thought of as a version-agnostic header,
* holding all relevant data from the two headers
* plus some GIMP-specific information.
*/
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
typedef struct
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
fmt_read_info_t read_info;
gchar fourcc[4];
gchar gimp_fourcc[4];
guint flags;
guint fmt_flags;
guint bpp;
guint gimp_bpp;
DXGI_FORMAT dxgi_format;
D3DFORMAT d3d9_format;
DDS_COMPRESSION_TYPE comp_format;
guint width;
guint height;
gint tile_height;
gsize linear_size;
gsize pitch;
guint mipmaps;
guint volume_slices;
guint array_items;
guint cubemap_faces;
guint gimp_version;
guchar *palette;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
} dds_load_info_t;
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
static gboolean read_header (dds_header_t *hdr,
FILE *fp);
static gboolean read_header_dx10 (dds_header_dx10_t *hdr,
FILE *fp);
static gboolean validate_header (dds_header_t *hdr,
GError **error);
static gboolean validate_dx10_header (dds_header_dx10_t *dx10hdr,
dds_load_info_t *load_info,
GError **error);
static gboolean load_layer (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
guint level,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
GError **error);
static gboolean load_mipmaps (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
gboolean read_mipmaps,
GError **error);
static gboolean load_face (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
gboolean read_mipmaps,
GError **error);
static gboolean load_dialog (GimpProcedure *procedure,
GimpProcedureConfig *config);
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Read DDS file */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
GimpPDBStatusType
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
read_dds (GFile *file,
GimpImage **ret_image,
gboolean interactive,
GimpProcedure *procedure,
GimpProcedureConfig *config,
GError **error)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
GimpImage *image = NULL;
guint layer_index = 0;
guchar *buf, *pixels;
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
FILE *fp;
plug-ins: Fix DDS vulnerability (ZDI-CAN-22093) Resolves #10069 Currently, the DDS header information for the width, height, and bytes per scan line are read in and assumed to be correct. As these values are used for memory allocation and reading, it would be good to verify they do not exceed the file size. This patch adds a condition after the header is read in to verify those values. If they exceed the file size (mins an offset), the file is not read in and an error message is shown.
2023-09-26 10:37:15 +08:00
gsize file_size;
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
dds_header_t hdr;
dds_header_dx10_t dx10hdr;
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
dds_load_info_t load_info;
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
GList *layers;
GimpImageBaseType type;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
GimpPrecision precision = GIMP_PRECISION_U8_NON_LINEAR;
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
gboolean read_mipmaps;
plug-ins: add option to vertically flip dds image on import Some games apparently need dds images to be vertically flipped. We already have an option to flip dds images on export, so it makes sense to also allow flipping on import.
2023-11-11 02:40:29 +08:00
gboolean flip_import;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
gint i, j;
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
if (interactive)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
gimp_ui_init ("dds");
if (! load_dialog (procedure, config))
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_CANCEL;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
g_object_get (config,
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
"load-mipmaps", &read_mipmaps,
"flip-image", &flip_import,
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
NULL);
plug-ins: more replacement of g_file_get_path() to g_file_peek_path(). While doing this cleanup, I found at least several other string leaks in: file-compressor, file-gegl, file-pdf-save, file-raw-data, file-xwd, jpeg-load, psd-save… So it's quite worth it! Note: in file-pdf-save, there is a global variable file_name which seems to be happily leaked without caring (didn't look in details, but looks so). I didn't fix this one which will require a bit more in-depth logics care.
2021-10-02 00:56:12 +08:00
fp = g_fopen (g_file_peek_path (file), "rb");
pdb, app, libgimp, plug-ins: replace most PDB filenames/URIs by GFile and in an attack of madness, changes almost all file plug-in code to use GFile instead of filenames, which means passing the GFile down to the bottom and get its filename at the very end where it's actually needed.
2019-09-12 03:48:34 +08:00
if (! fp)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Could not open '%s' for reading: %s"),
gimp_file_get_utf8_name (file), g_strerror (errno));
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Get total file size to compare against header info later */
plug-ins: Fix DDS vulnerability (ZDI-CAN-22093) Resolves #10069 Currently, the DDS header information for the width, height, and bytes per scan line are read in and assumed to be correct. As these values are used for memory allocation and reading, it would be good to verify they do not exceed the file size. This patch adds a condition after the header is read in to verify those values. If they exceed the file size (mins an offset), the file is not read in and an error message is shown.
2023-09-26 10:37:15 +08:00
fseek (fp, 0L, SEEK_END);
file_size = ftell (fp);
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
fseek (fp, 0L, SEEK_SET);
plug-ins: Fix DDS vulnerability (ZDI-CAN-22093) Resolves #10069 Currently, the DDS header information for the width, height, and bytes per scan line are read in and assumed to be correct. As these values are used for memory allocation and reading, it would be good to verify they do not exceed the file size. This patch adds a condition after the header is read in to verify those values. If they exceed the file size (mins an offset), the file is not read in and an error message is shown.
2023-09-26 10:37:15 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
gimp_progress_init_printf (_("Loading: %s"), gimp_file_get_utf8_name (file));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Read standard header */
memset (&hdr, 0, sizeof (dds_header_t));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
read_header (&hdr, fp);
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Check that header is actually valid */
if (! validate_header (&hdr, error))
{
fclose (fp);
return GIMP_PDB_EXECUTION_ERROR;
}
/* Initialize load_info with data from header */
memset (&load_info, 0, sizeof (dds_load_info_t));
PUTL32 (load_info.fourcc, GETL32 (hdr.pixelfmt.fourcc));
load_info.flags = hdr.flags;
load_info.fmt_flags = hdr.pixelfmt.flags;
load_info.width = hdr.width;
load_info.height = hdr.height;
load_info.gimp_version = hdr.reserved.gimp_dds_special.version;
PUTL32 (load_info.gimp_fourcc, hdr.reserved.gimp_dds_special.extra_fourcc);
/* Get D3DFORMAT directly from FourCC if present there,
* otherwise find it based on provided bpp, masks, and flags */
if ((load_info.fmt_flags & DDPF_FOURCC) && (load_info.fourcc[1] == 0))
load_info.d3d9_format = GETL32 (load_info.fourcc);
else
load_info.d3d9_format = get_d3d9format (hdr.pixelfmt.bpp,
hdr.pixelfmt.rmask,
hdr.pixelfmt.gmask,
hdr.pixelfmt.bmask,
hdr.pixelfmt.amask,
hdr.pixelfmt.flags);
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Read DX10 header if present */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
memset (&dx10hdr, 0, sizeof (dds_header_dx10_t));
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (GETL32 (load_info.fourcc) == FOURCC ('D','X','1','0'))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
read_header_dx10 (&dx10hdr, fp);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Check that DX10 header is actually valid */
if (! validate_dx10_header (&dx10hdr, &load_info, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* If format search was successful, get info needed to parse the file */
if (load_info.d3d9_format || load_info.dxgi_format)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.read_info = get_format_read_info (load_info.d3d9_format,
load_info.dxgi_format);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((! hdr.pixelfmt.bpp) && load_info.d3d9_format)
hdr.pixelfmt.bpp = get_bpp_d3d9 (load_info.d3d9_format);
else if (load_info.dxgi_format)
hdr.pixelfmt.bpp = get_bpp_dxgi (load_info.dxgi_format);
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Unset the FourCC flag as D3D formats will be handled as uncompressed */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.fmt_flags & DDPF_FOURCC) && load_info.d3d9_format)
load_info.fmt_flags &= ~DDPF_FOURCC;
}
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Exit if uncompressed format could not be determined by any method */
if ((! (load_info.fmt_flags & DDPF_FOURCC)) &&
(! (load_info.d3d9_format || load_info.dxgi_format)))
{
fclose (fp);
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Unsupported DDS pixel format:\n"
"bpp: %d, Rmask: %x, Gmask: %x, Bmask: %x, Amask: %x, flags: %u"),
hdr.pixelfmt.bpp,
hdr.pixelfmt.rmask, hdr.pixelfmt.gmask,
hdr.pixelfmt.bmask, hdr.pixelfmt.amask,
hdr.pixelfmt.flags);
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* If compressed, determine the format used */
if (load_info.fmt_flags & DDPF_FOURCC)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (GETL32 (load_info.fourcc) == FOURCC ('D','X','1','0'))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Compression type from DXGI format */
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
switch (dx10hdr.dxgiFormat)
{
case DXGI_FORMAT_BC1_TYPELESS:
case DXGI_FORMAT_BC1_UNORM:
case DXGI_FORMAT_BC1_UNORM_SRGB:
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_BC1;
break;
case DXGI_FORMAT_BC2_TYPELESS:
case DXGI_FORMAT_BC2_UNORM:
case DXGI_FORMAT_BC2_UNORM_SRGB:
load_info.comp_format = DDS_COMPRESS_BC2;
break;
case DXGI_FORMAT_BC3_TYPELESS:
case DXGI_FORMAT_BC3_UNORM:
case DXGI_FORMAT_BC3_UNORM_SRGB:
load_info.comp_format = DDS_COMPRESS_BC3;
break;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
case DXGI_FORMAT_BC4_TYPELESS:
case DXGI_FORMAT_BC4_UNORM:
case DXGI_FORMAT_BC4_SNORM:
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_BC4;
break;
case DXGI_FORMAT_BC5_TYPELESS:
case DXGI_FORMAT_BC5_UNORM:
case DXGI_FORMAT_BC5_SNORM:
load_info.comp_format = DDS_COMPRESS_BC5;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
break;
default:
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_MAX;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
break;
}
}
else
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Compression type from FourCC */
switch (GETL32 (load_info.fourcc))
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
{
case FOURCC ('D','X','T','1'):
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_BC1;
break;
case FOURCC ('D','X','T','2'):
case FOURCC ('D','X','T','3'):
load_info.comp_format = DDS_COMPRESS_BC2;
break;
case FOURCC ('D','X','T','4'):
case FOURCC ('D','X','T','5'):
case FOURCC ('R','X','G','B'):
load_info.comp_format = DDS_COMPRESS_BC3;
break;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
case FOURCC ('A','T','I','1'):
case FOURCC ('B','C','4','U'):
case FOURCC ('B','C','4','S'):
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_BC4;
break;
case FOURCC ('A','T','I','2'):
case FOURCC ('B','C','5','U'):
case FOURCC ('B','C','5','S'):
load_info.comp_format = DDS_COMPRESS_BC5;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
break;
default:
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.comp_format = DDS_COMPRESS_MAX;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
break;
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
plug-ins, dds: always compute pitch_or_linsize ourselves Certain dds images can have non-zero unexpected pitch_or_linsize values. Until now we were only computing this ourselves in case it was zero. Let's just always compute it and print an error to the terminal if it differs from the value in the file. A sample can be found in Galactic Civilizations 3: Bokeh_Hex.dds. This change also allows us to safely load the poc in security issue ZDI-CAN-22093 as that issue was apparently only caused by an invalid value of pitch_or_linsize.
2023-11-03 03:21:10 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Determine resource type (cubemap, volume, array) and number of mipmaps.
* Filling in these variables conditionally here simplifies some checks later */
if (load_info.dxgi_format)
plug-ins, dds: always compute pitch_or_linsize ourselves Certain dds images can have non-zero unexpected pitch_or_linsize values. Until now we were only computing this ourselves in case it was zero. Let's just always compute it and print an error to the terminal if it differs from the value in the file. A sample can be found in Galactic Civilizations 3: Bokeh_Hex.dds. This change also allows us to safely load the poc in security issue ZDI-CAN-22093 as that issue was apparently only caused by an invalid value of pitch_or_linsize.
2023-11-03 03:21:10 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (dx10hdr.resourceDimension == D3D10_RESOURCE_DIMENSION_TEXTURE3D)
load_info.volume_slices = hdr.depth;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((dx10hdr.resourceDimension == D3D10_RESOURCE_DIMENSION_TEXTURE2D) &&
(dx10hdr.miscFlag & D3D10_RESOURCE_MISC_TEXTURECUBE))
load_info.cubemap_faces = DDSCAPS2_CUBEMAP_ALL_FACES;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.array_items = dx10hdr.arraySize;
plug-ins: fix #10240 DDS saved as RGB10A2 loads incorrectly There were 2 issues here: 1. When more than 8 bits per sample are used, a previous commit changed it so that we would be using 16-bit integer mode instead of 8-bit. However, the actual code for this specific format was not updated to reflect that. We fix this by computing 16-bits per channel values and upshifting the 10 and 2-bit samples to 16 bit per channel. 2. The computation of masks was incorrect. It computed each channel mask separately, based on whether it was <= 8 or not. However, if any channel needs more than 8 bits, all masks should be computed 16 bits since we will then 16-bit integer mode. We fix this by checking all channel bits together, and if any is higher than 8, but not more than 16, we use 16-bit masks. I also took this opportunity to add support for 32-bit masks if we ever need those.
2023-11-02 03:24:02 +08:00
}
plug-ins: compute DDS variables earlier and support 16-bit masks To be able to use certain variables we use in our DDS loader earlier, we move the computation of these variables up. We also add checks to see if the mask needs to be for 8 or 16-bit, since there are DDS images with 16 bits per sample.
2022-05-03 02:42:43 +08:00
else
plug-ins: fix #10240 DDS saved as RGB10A2 loads incorrectly There were 2 issues here: 1. When more than 8 bits per sample are used, a previous commit changed it so that we would be using 16-bit integer mode instead of 8-bit. However, the actual code for this specific format was not updated to reflect that. We fix this by computing 16-bits per channel values and upshifting the 10 and 2-bit samples to 16 bit per channel. 2. The computation of masks was incorrect. It computed each channel mask separately, based on whether it was <= 8 or not. However, if any channel needs more than 8 bits, all masks should be computed 16 bits since we will then 16-bit integer mode. We fix this by checking all channel bits together, and if any is higher than 8, but not more than 16, we use 16-bit masks. I also took this opportunity to add support for 32-bit masks if we ever need those.
2023-11-02 03:24:02 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* This and the mipmap check below were originally AND, not OR,
* but some images out there only have one of these two flags,
* so for compatibility's sake we take the more lenient route */
if ((hdr.caps.caps2 & DDSCAPS2_VOLUME) ||
(load_info.flags & DDSD_DEPTH))
load_info.volume_slices = hdr.depth;
load_info.cubemap_faces = hdr.caps.caps2 & DDSCAPS2_CUBEMAP_ALL_FACES;
plug-ins: fix #10240 DDS saved as RGB10A2 loads incorrectly There were 2 issues here: 1. When more than 8 bits per sample are used, a previous commit changed it so that we would be using 16-bit integer mode instead of 8-bit. However, the actual code for this specific format was not updated to reflect that. We fix this by computing 16-bits per channel values and upshifting the 10 and 2-bit samples to 16 bit per channel. 2. The computation of masks was incorrect. It computed each channel mask separately, based on whether it was <= 8 or not. However, if any channel needs more than 8 bits, all masks should be computed 16 bits since we will then 16-bit integer mode. We fix this by checking all channel bits together, and if any is higher than 8, but not more than 16, we use 16-bit masks. I also took this opportunity to add support for 32-bit masks if we ever need those.
2023-11-02 03:24:02 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((hdr.caps.caps1 & DDSCAPS_MIPMAP) ||
(load_info.flags & DDSD_MIPMAPCOUNT))
load_info.mipmaps = hdr.num_mipmaps;
plug-ins: compute DDS variables earlier and support 16-bit masks To be able to use certain variables we use in our DDS loader earlier, we move the computation of these variables up. We also add checks to see if the mask needs to be for 8 or 16-bit, since there are DDS images with 16 bits per sample.
2022-05-03 02:42:43 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Historically many DDS exporters haven't set pitch/linearsize and the corresponding flags,
* or set them incorrectly, so it's more reliable to always compute these manually.
* See: https://learn.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-pguide
*/
if (load_info.fmt_flags & DDPF_FOURCC)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (hdr.flags & DDSD_PITCH)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_printerr ("Warning: DDSD_PITCH is incorrectly set for DDPF_FOURCC! (recovered)\n");
load_info.flags &= ~DDSD_PITCH;
}
if (! (hdr.flags & DDSD_LINEARSIZE))
{
g_printerr ("Warning: DDSD_LINEARSIZE is incorrectly not set for DDPF_FOURCC! (recovered)\n");
load_info.flags |= DDSD_LINEARSIZE;
}
load_info.pitch = MAX (1, (hdr.width + 3) >> 2);
if (load_info.comp_format == DDS_COMPRESS_BC1 ||
load_info.comp_format == DDS_COMPRESS_BC4)
{
load_info.pitch *= 8;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
}
else
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.pitch *= 16;
}
load_info.linear_size = MAX (1, (hdr.height + 3) >> 2) * load_info.pitch;
if (load_info.linear_size != hdr.pitch_or_linsize)
{
g_printerr ("Unexpected linear size (%u) set to %u\n",
hdr.pitch_or_linsize, (guint32) load_info.linear_size);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
else
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! (hdr.flags & DDSD_PITCH))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_printerr ("Warning: DDSD_PITCH is incorrectly not set for an uncompressed texture! (recovered)\n");
load_info.flags |= DDSD_PITCH;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((hdr.flags & DDSD_LINEARSIZE))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_printerr ("Warning: DDSD_LINEARSIZE is incorrectly set for an uncompressed texture! (recovered)\n");
load_info.flags &= ~DDSD_LINEARSIZE;
}
load_info.pitch = (hdr.width * hdr.pixelfmt.bpp + 7) >> 3;
if (load_info.pitch != hdr.pitch_or_linsize)
{
g_printerr ("Unexpected pitch (%u) set to %u\n",
hdr.pitch_or_linsize, (guint32) load_info.pitch);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info.linear_size = load_info.pitch * hdr.height;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Determine bytes-per-pixel and GIMP type needed */
if (load_info.fmt_flags & DDPF_FOURCC)
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Compressed */
switch (load_info.comp_format)
{
case DDS_COMPRESS_BC4:
load_info.bpp = load_info.gimp_bpp = 1; /* Gray */
type = GIMP_GRAY;
break;
case DDS_COMPRESS_BC5:
load_info.bpp = load_info.gimp_bpp = 3; /* RGB */
type = GIMP_RGB;
break;
default:
load_info.bpp = load_info.gimp_bpp = 4; /* RGBA */
type = GIMP_RGB;
break;
}
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
precision = GIMP_PRECISION_U8_NON_LINEAR;
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Uncompressed */
load_info.bpp = hdr.pixelfmt.bpp >> 3;
type = load_info.read_info.gimp_type;
/* Set up GIMP bytes-per-pixel */
if (load_info.read_info.gimp_type == GIMP_INDEXED)
{
load_info.gimp_bpp = 1;
if (load_info.read_info.use_alpha)
load_info.gimp_bpp += 1;
}
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
else
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
{
if (load_info.read_info.gimp_type == GIMP_RGB)
load_info.gimp_bpp = 3;
else /* load_info.read_info.gimp_type == GIMP_GRAY */
load_info.gimp_bpp = 1;
if (load_info.read_info.use_alpha)
load_info.gimp_bpp += 1;
if (load_info.read_info.output_bit_depth == 16)
load_info.gimp_bpp *= 2;
else if (load_info.read_info.output_bit_depth == 32)
load_info.gimp_bpp *= 4;
}
/* Set up canvas precision */
if (load_info.read_info.output_bit_depth == 8)
{
precision = GIMP_PRECISION_U8_NON_LINEAR;
}
else if (load_info.read_info.output_bit_depth == 16)
{
if (load_info.read_info.is_float)
precision = GIMP_PRECISION_HALF_LINEAR;
else
precision = GIMP_PRECISION_U16_NON_LINEAR;
}
else if (load_info.read_info.output_bit_depth == 32)
{
if (load_info.read_info.is_float)
precision = GIMP_PRECISION_FLOAT_LINEAR;
else
precision = GIMP_PRECISION_U32_NON_LINEAR;
}
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Verify header information is accurate to avoid allocating more memory than is actually needed */
if (load_info.bpp < 1 ||
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
(load_info.linear_size > (file_size - sizeof (hdr))))
plug-ins: port dds-write to GimpProcedureDialog. Note that "save-type" and "mipmaps" were left as ints rather than GimpChoice, as some options are conditionally disabled and I don't know if that is available in GimpChoice just yet. A DDS loading bug related to 6ad54ca3 was also resolved. The correct header value to check for the pixel size was not "depth" but "bpp".
2023-10-27 01:16:49 +08:00
{
fclose (fp);
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
_("Invalid or corrupted DDS header."));
plug-ins: port dds-write to GimpProcedureDialog. Note that "save-type" and "mipmaps" were left as ints rather than GimpChoice, as some options are conditionally disabled and I don't know if that is available in GimpChoice just yet. A DDS loading bug related to 6ad54ca3 was also resolved. The correct header value to check for the pixel size was not "depth" but "bpp".
2023-10-27 01:16:49 +08:00
return GIMP_PDB_EXECUTION_ERROR;
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Generate GIMP image with set precision */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
image = gimp_image_new_with_precision (load_info.width,
load_info.height,
type, precision);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
if (! image)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM,
_("Could not allocate a new image."));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
fclose (fp);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Read palette for indexed DDS */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info.fmt_flags & DDPF_PALETTEINDEXED8)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
load_info.palette = g_malloc (256 * 4);
if (fread (load_info.palette, 1, 1024, fp) != 1024)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Error reading palette."));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
for (i = j = 0; i < 768; i += 3, j += 4)
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
load_info.palette[i + 0] = load_info.palette[j + 0];
load_info.palette[i + 1] = load_info.palette[j + 1];
load_info.palette[i + 2] = load_info.palette[j + 2];
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
gimp_image_set_colormap (image, load_info.palette, 256);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
load_info.tile_height = gimp_tile_height ();
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
pixels = g_new (guchar, load_info.tile_height * load_info.width * load_info.gimp_bpp);
buf = g_malloc (load_info.linear_size);
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info.cubemap_faces) /* Cubemap texture */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_POSITIVEX) &&
! load_face (fp, &load_info, image, "(positive x)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_NEGATIVEX) &&
! load_face (fp, &load_info, image, "(negative x)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_POSITIVEY) &&
! load_face (fp, &load_info, image, "(positive y)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_NEGATIVEY) &&
! load_face (fp, &load_info, image, "(negative y)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_POSITIVEZ) &&
! load_face (fp, &load_info, image, "(positive z)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info.cubemap_faces & DDSCAPS2_CUBEMAP_NEGATIVEZ) &&
! load_face (fp, &load_info, image, "(negative z)",
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (load_info.volume_slices > 0) /* Volume texture */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guint i, level;
gchar *plane;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
for (i = 0; i < load_info.volume_slices; ++i)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plane = g_strdup_printf ("(z = %d)", i);
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_layer (fp, &load_info, image, 0, plane,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, error))
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (plane);
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (plane);
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (read_mipmaps)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
for (level = 1; level < load_info.mipmaps; ++level)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
int n = load_info.volume_slices >> level;
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
if (n < 1)
n = 1;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
for (i = 0; i < n; ++i)
{
plane = g_strdup_printf ("(z = %d)", i);
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_layer (fp, &load_info, image, level, plane,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
&layer_index, pixels, buf, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
g_free (plane);
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (plane);
}
}
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (load_info.array_items > 1) /* Texture Array */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guint i;
gchar *elem;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
for (i = 0; i < load_info.array_items; ++i)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
elem = g_strdup_printf ("(array element %d)", i);
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_layer (fp, &load_info, image, 0, elem, &layer_index,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
pixels, buf, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_mipmaps (fp, &load_info, image, elem, &layer_index,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
pixels, buf, read_mipmaps, error))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
fclose (fp);
gimp_image_delete (image);
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (elem);
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* Standard 2D texture */
{
if (! load_layer (fp, &load_info, image, 0, "", &layer_index,
pixels, buf, error))
{
fclose (fp);
gimp_image_delete (image);
return GIMP_PDB_EXECUTION_ERROR;
}
if (! load_mipmaps (fp, &load_info, image, "", &layer_index,
pixels, buf, read_mipmaps, error))
{
fclose (fp);
gimp_image_delete (image);
return GIMP_PDB_EXECUTION_ERROR;
}
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
gimp_progress_update (1.0);
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info.fmt_flags & DDPF_PALETTEINDEXED8)
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
g_free (load_info.palette);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (buf);
g_free (pixels);
fclose (fp);
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
layers = gimp_image_list_layers (image);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
if (! layers)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
/* XXX This error should never happen, and probably it should be a
* CRITICAL/g_return_if_fail(). Yet let's just set it to the
* GError until we better handle the debug dialog for plug-ins. A
* pop-up with this message will be easier to track. No need to
* localize it though.
*/
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
"Oops! NULL image read! Please report this!");
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_EXECUTION_ERROR;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: get rid of gimp_image_(s|g)et_active_layer(). No more usage of the single active layer concept in existing plug-in code.
2021-02-24 19:09:15 +08:00
gimp_image_take_selected_layers (image, layers);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: add option to vertically flip dds image on import Some games apparently need dds images to be vertically flipped. We already have an option to flip dds images on export, so it makes sense to also allow flipping on import.
2023-11-11 02:40:29 +08:00
if (flip_import)
gimp_image_flip (image, GIMP_ORIENTATION_VERTICAL);
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
*ret_image = image;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
return GIMP_PDB_SUCCESS;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/*
* Read data from standard header
*/
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
read_header (dds_header_t *hdr,
FILE *fp)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guchar buf[DDS_HEADERSIZE];
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
if (fread (buf, 1, DDS_HEADERSIZE, fp) != DDS_HEADERSIZE)
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
hdr->magic = GETL32 (buf);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
hdr->size = GETL32 (buf + 4);
hdr->flags = GETL32 (buf + 8);
hdr->height = GETL32 (buf + 12);
hdr->width = GETL32 (buf + 16);
hdr->pitch_or_linsize = GETL32 (buf + 20);
hdr->depth = GETL32 (buf + 24);
hdr->num_mipmaps = GETL32 (buf + 28);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
hdr->pixelfmt.size = GETL32 (buf + 76);
hdr->pixelfmt.flags = GETL32 (buf + 80);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
hdr->pixelfmt.fourcc[0] = buf[84];
hdr->pixelfmt.fourcc[1] = buf[85];
hdr->pixelfmt.fourcc[2] = buf[86];
hdr->pixelfmt.fourcc[3] = buf[87];
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
hdr->pixelfmt.bpp = GETL32 (buf + 88);
hdr->pixelfmt.rmask = GETL32 (buf + 92);
hdr->pixelfmt.gmask = GETL32 (buf + 96);
hdr->pixelfmt.bmask = GETL32 (buf + 100);
hdr->pixelfmt.amask = GETL32 (buf + 104);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
hdr->caps.caps1 = GETL32 (buf + 108);
hdr->caps.caps2 = GETL32 (buf + 112);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
/* GIMP-DDS special info */
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
if (GETL32 (buf + 32) == FOURCC ('G','I','M','P') &&
GETL32 (buf + 36) == FOURCC ('-','D','D','S'))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
hdr->reserved.gimp_dds_special.magic1 = GETL32 (buf + 32);
hdr->reserved.gimp_dds_special.magic2 = GETL32 (buf + 36);
hdr->reserved.gimp_dds_special.version = GETL32 (buf + 40);
hdr->reserved.gimp_dds_special.extra_fourcc = GETL32 (buf + 44);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return TRUE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/*
* Read data from DX10 header
*/
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
read_header_dx10 (dds_header_dx10_t *dx10hdr,
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
FILE *fp)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
gchar buf[DDS_HEADERSIZE_DX10];
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
if (fread (buf, 1, DDS_HEADERSIZE_DX10, fp) != DDS_HEADERSIZE_DX10)
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
dx10hdr->dxgiFormat = GETL32 (buf);
dx10hdr->resourceDimension = GETL32 (buf + 4);
dx10hdr->miscFlag = GETL32 (buf + 8);
dx10hdr->arraySize = GETL32 (buf + 12);
dx10hdr->reserved = GETL32 (buf + 16);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return TRUE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/*
* Check data from standard header for validity
* Invalid header data is corrected where possible
*/
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
validate_header (dds_header_t *hdr,
GError **error)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guint fourcc;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Check ~ m a g i c ~ */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
if (hdr->magic != FOURCC ('D','D','S',' '))
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
_("Invalid DDS format magic number."));
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Check pixel format flags
* If none are set, try to recover based on what information is available */
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
fourcc = GETL32 (hdr->pixelfmt.fourcc);
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! (hdr->pixelfmt.flags & DDPF_RGB) &&
! (hdr->pixelfmt.flags & DDPF_ALPHA) &&
! (hdr->pixelfmt.flags & DDPF_BUMPDUDV) &&
! (hdr->pixelfmt.flags & DDPF_BUMPLUMINANCE) &&
! (hdr->pixelfmt.flags & DDPF_ZBUFFER) &&
! (hdr->pixelfmt.flags & DDPF_FOURCC) &&
! (hdr->pixelfmt.flags & DDPF_LUMINANCE) &&
! (hdr->pixelfmt.flags & DDPF_PALETTEINDEXED8))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_message (_("File lacks expected pixel format flags! "
"Image may not be decoded correctly."));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
switch (fourcc)
{
case FOURCC ('D','X','T','1'):
case FOURCC ('D','X','T','2'):
case FOURCC ('D','X','T','3'):
case FOURCC ('D','X','T','4'):
case FOURCC ('D','X','T','5'):
case FOURCC ('R','X','G','B'):
case FOURCC ('A','T','I','1'):
case FOURCC ('B','C','4','U'):
case FOURCC ('B','C','4','S'):
case FOURCC ('A','T','I','2'):
case FOURCC ('B','C','5','U'):
case FOURCC ('B','C','5','S'):
hdr->pixelfmt.flags |= DDPF_FOURCC;
break;
default:
switch (hdr->pixelfmt.bpp)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
case 8:
if (hdr->pixelfmt.flags & DDPF_ALPHAPIXELS)
hdr->pixelfmt.flags |= DDPF_ALPHA;
else
hdr->pixelfmt.flags |= DDPF_LUMINANCE;
break;
case 16:
case 24:
case 32:
plug-ins: support loading DDS with two 16-bit channels. We have some examples of DDS images that have two 16-bit channels that we could not load. This commit adds checks to see if we need 16-bit channels, and conversion of the input to a correct 16-bit red, green, blue or alpha channel.
2022-05-03 05:24:09 +08:00
case 64:
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
hdr->pixelfmt.flags |= DDPF_RGB;
break;
default:
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Invalid pixel format."));
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
break;
}
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Check all supported FourCC codes */
if ((hdr->pixelfmt.flags & DDPF_FOURCC) &&
fourcc != FOURCC ('D','X','T','1') &&
fourcc != FOURCC ('D','X','T','2') &&
fourcc != FOURCC ('D','X','T','3') &&
fourcc != FOURCC ('D','X','T','4') &&
fourcc != FOURCC ('D','X','T','5') &&
fourcc != FOURCC ('R','X','G','B') &&
fourcc != FOURCC ('A','T','I','1') &&
fourcc != FOURCC ('B','C','4','U') &&
fourcc != FOURCC ('B','C','4','S') &&
fourcc != FOURCC ('A','T','I','2') &&
fourcc != FOURCC ('B','C','5','U') &&
fourcc != FOURCC ('B','C','5','S') &&
fourcc != FOURCC ('D','X','1','0') &&
hdr->pixelfmt.fourcc[1] != 0)
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Unsupported format (FourCC: %c%c%c%c, hex: %08x)"),
hdr->pixelfmt.fourcc[0],
hdr->pixelfmt.fourcc[1] != 0 ? hdr->pixelfmt.fourcc[1] : ' ',
hdr->pixelfmt.fourcc[2] != 0 ? hdr->pixelfmt.fourcc[2] : ' ',
hdr->pixelfmt.fourcc[3] != 0 ? hdr->pixelfmt.fourcc[3] : ' ',
GETL32 (hdr->pixelfmt.fourcc));
return FALSE;
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Check bits-per-pixel */
if (hdr->pixelfmt.flags & DDPF_RGB)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((hdr->pixelfmt.bpp != 8) &&
(hdr->pixelfmt.bpp != 16) &&
(hdr->pixelfmt.bpp != 24) &&
(hdr->pixelfmt.bpp != 32) &&
(hdr->pixelfmt.bpp != 48) &&
(hdr->pixelfmt.bpp != 64) &&
(hdr->pixelfmt.bpp != 96) &&
(hdr->pixelfmt.bpp != 128))
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Invalid bpp value for RGB data: %d"),
hdr->pixelfmt.bpp);
return FALSE;
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (hdr->pixelfmt.flags & DDPF_LUMINANCE)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((hdr->pixelfmt.bpp != 8) &&
(hdr->pixelfmt.bpp != 16))
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Invalid bpp value for luminance data: %d"),
hdr->pixelfmt.bpp);
return FALSE;
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
return TRUE;
}
/*
* Check data from DX10 header for validity
*/
static gboolean
validate_dx10_header (dds_header_dx10_t *dx10hdr,
dds_load_info_t *load_info,
GError **error)
{
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
if ((dx10hdr->resourceDimension != D3D10_RESOURCE_DIMENSION_TEXTURE1D) &&
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
(dx10hdr->resourceDimension != D3D10_RESOURCE_DIMENSION_TEXTURE2D) &&
(dx10hdr->resourceDimension != D3D10_RESOURCE_DIMENSION_TEXTURE3D))
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Invalid DX10 header"));
return FALSE;
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
switch (dx10hdr->dxgiFormat)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
case DXGI_FORMAT_BC1_TYPELESS:
case DXGI_FORMAT_BC1_UNORM:
case DXGI_FORMAT_BC1_UNORM_SRGB:
case DXGI_FORMAT_BC2_TYPELESS:
case DXGI_FORMAT_BC2_UNORM:
case DXGI_FORMAT_BC2_UNORM_SRGB:
case DXGI_FORMAT_BC3_TYPELESS:
case DXGI_FORMAT_BC3_UNORM:
case DXGI_FORMAT_BC3_UNORM_SRGB:
case DXGI_FORMAT_BC4_TYPELESS:
case DXGI_FORMAT_BC4_UNORM:
case DXGI_FORMAT_BC4_SNORM:
case DXGI_FORMAT_BC5_TYPELESS:
case DXGI_FORMAT_BC5_UNORM:
case DXGI_FORMAT_BC5_SNORM:
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Return early for supported compressed formats */
return TRUE;
default:
/* Unset FourCC flag for uncompressed formats */
load_info->fmt_flags &= ~DDPF_FOURCC;
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
break;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
}
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! dxgiformat_supported (dx10hdr->dxgiFormat & 0xFF))
{
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
_("Unsupported DXGI Format: %u"),
dx10hdr->dxgiFormat & 0xFF);
Better handling of DX10+ files in ddsread Partial refactor of parts of ddsread to better handle DX10+ files. Though not included here, this is necessary to import formats that have no DX9 equivalent, namely BC6H and BC7, as the current handling simply downgrades DX10 files and imports them like DX9 ones.
2023-11-26 10:47:49 +08:00
return FALSE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_info->dxgi_format = dx10hdr->dxgiFormat & 0xFF;
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return TRUE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
static const Babl *
file-dds: support for DXT2/DXT4, initial build and GEGL-related fixes
2018-11-13 07:44:11 +08:00
premultiplied_variant (const Babl* format)
{
if (format == babl_format ("R'G'B'A u8"))
return babl_format ("R'aG'aB'aA u8");
else
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
g_printerr ("Add format %s to premultiplied_variant () %s: %d\n",
babl_get_name (format), __FILE__, __LINE__);
file-dds: support for DXT2/DXT4, initial build and GEGL-related fixes
2018-11-13 07:44:11 +08:00
return format;
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_layer (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
guint level,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
GError **error)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
GeglBuffer *buffer;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
const Babl *bablfmt = NULL;
gchar *babl_str = "";
GimpImageType type = GIMP_RGBA_IMAGE;
guint width = load_info->width >> level;
guint height = load_info->height >> level;
plug-ins: fix failure to load certain mipmapped DDS images We compute the size of the mipmapped layers wrong. We assume that width, height are always exactly a power of 2, which is the normal case for dds images. See issue #11256. Since other sizes are possible, we adjust this by computing the width times height times bytes per pixel of the current mimmap level.
2024-04-10 01:33:27 +08:00
guint size = width * height * load_info->bpp;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
gchar *layer_name;
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
GimpLayer *layer;
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guint layerw;
plug-ins: Fix DDS import regression from 6ad54ca3 @Wormnest pointed out that compressed files are likely smaller than width * height * bps, so our check to prevent ZDI-CAN-22093 also caught valid files. The size check is removed from load_image () and moved to load_layer () before the two fread() functions, as we know exactly how much we'll try to read at that point.
2023-10-28 03:24:18 +08:00
gsize file_size;
gsize current_position;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
gint x, y, n;
plug-ins: Fix DDS import regression from 6ad54ca3 @Wormnest pointed out that compressed files are likely smaller than width * height * bps, so our check to prevent ZDI-CAN-22093 also caught valid files. The size check is removed from load_image () and moved to load_layer () before the two fread() functions, as we know exactly how much we'll try to read at that point.
2023-10-28 03:24:18 +08:00
current_position = ftell (fp);
fseek (fp, 0L, SEEK_END);
file_size = ftell (fp);
fseek (fp, current_position, SEEK_SET);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
if (width < 1) width = 1;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
if (height < 1) height = 1;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Setup image type and Babl format */
if (load_info->fmt_flags & DDPF_FOURCC) /* Compressed */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Set Babl format */
switch (load_info->comp_format)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
case DDS_COMPRESS_BC4:
type = GIMP_GRAY_IMAGE;
babl_str = "Y'";
break;
case DDS_COMPRESS_BC5:
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
type = GIMP_RGB_IMAGE;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
babl_str = "R'G'B'";
break;
default:
type = GIMP_RGBA_IMAGE;
babl_str = "R'G'B'A";
break;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Set Babl precision */
if ((GETL32 (load_info->fourcc) == FOURCC ('D','X','1','0')) &&
(load_info->dxgi_format >= DXGI_FORMAT_BC6H_TYPELESS) &&
(load_info->dxgi_format <= DXGI_FORMAT_BC6H_SF16))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
babl_str = g_strdup_printf ("%s %s", babl_str, "half");
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
else
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
babl_str = g_strdup_printf ("%s %s", babl_str, "u8");
plug-ins: fix #7566 Import Issues with Indexed .dds Images This proved to be both an import and export issue. Our import set expected format as RGB, causing garbled image output. Our export for indexed images converted to grayscale first, although the palette was correctly saved. This caused wrong palette indexes on import. For indexed images, on import, we request the actual indexed format after creating the layer with gimp_drawable_get_format, which gives us a correct indexed Babl format. Also added logic for indexed with alpha, although I have no sample images to test this. For indexed images on export we do the same: use gimp_drawable_get_format to get an actual indexed Babl format.
2021-12-02 04:01:26 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
}
else /* Uncompressed */
{
/* Set Babl format */
if (load_info->read_info.gimp_type == GIMP_INDEXED)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
type = GIMP_INDEXEDA_IMAGE;
else
type = GIMP_INDEXED_IMAGE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (load_info->read_info.gimp_type == GIMP_RGB)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
type = GIMP_RGBA_IMAGE;
babl_str = "R'G'B'A";
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
}
else
{
type = GIMP_RGB_IMAGE;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
babl_str = "R'G'B'";
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* load_info->read_info.gimp_type == GIMP_GRAY */
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
{
type = GIMP_GRAYA_IMAGE;
babl_str = "Y'A";
}
else
{
type = GIMP_GRAY_IMAGE;
babl_str = "Y'";
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Set Babl precision */
if (load_info->read_info.is_float)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Floating-point */
if (load_info->read_info.output_bit_depth == 16)
babl_str = g_strdup_printf ("%s %s", babl_str, "half");
else /* load_info->read_info.output_bit_depth == 32 */
babl_str = g_strdup_printf ("%s %s", babl_str, "float");
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Integer */
if (load_info->read_info.output_bit_depth == 32)
babl_str = g_strdup_printf ("%s %s", babl_str, "u32");
else if (load_info->read_info.output_bit_depth == 16)
babl_str = g_strdup_printf ("%s %s", babl_str, "u16");
else /* load_info->read_info.output_bit_depth == 8 */
babl_str = g_strdup_printf ("%s %s", babl_str, "u8");
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! (load_info->read_info.gimp_type == GIMP_INDEXED))
bablfmt = babl_format (babl_str);
g_free (babl_str);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
layer_name = (level) ? g_strdup_printf ("mipmap %d %s", level, prefix) :
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_strdup_printf ("main surface %s", prefix);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
layer = gimp_layer_new (image, layer_name, width, height, type, 100,
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
gimp_image_get_default_new_layer_mode (image));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
g_free (layer_name);
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
gimp_image_insert_layer (image, layer, NULL, *layer_index);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: fix #7566 Import Issues with Indexed .dds Images This proved to be both an import and export issue. Our import set expected format as RGB, causing garbled image output. Our export for indexed images converted to grayscale first, although the palette was correctly saved. This caused wrong palette indexes on import. For indexed images, on import, we request the actual indexed format after creating the layer with gimp_drawable_get_format, which gives us a correct indexed Babl format. Also added logic for indexed with alpha, although I have no sample images to test this. For indexed images on export we do the same: use gimp_drawable_get_format to get an actual indexed Babl format.
2021-12-02 04:01:26 +08:00
if (type == GIMP_INDEXED_IMAGE || type == GIMP_INDEXEDA_IMAGE)
bablfmt = gimp_drawable_get_format (GIMP_DRAWABLE (layer));
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
if ((*layer_index)++)
gimp_item_set_visible (GIMP_ITEM (layer), FALSE);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: port file-dds to GimpPlugIn and libgimp objects This is such a monster, I'm sure I broke something here...
2019-08-27 20:43:38 +08:00
buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
layerw = gegl_buffer_get_width (buffer);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->fmt_flags & DDPF_FOURCC)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
size = ((width + 3) >> 2) * ((height + 3) >> 2);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Let Babl handle premultiplied format conversion */
if ((GETL32 (load_info->fourcc) == FOURCC ('D','X','T','2')) ||
(GETL32 (load_info->fourcc) == FOURCC ('D','X','T','4')))
bablfmt = premultiplied_variant (bablfmt);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info->comp_format == DDS_COMPRESS_BC1) ||
(load_info->comp_format == DDS_COMPRESS_BC4))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
size *= 8;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
else
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
size *= 16;
}
plug-ins: Additional fixes for DDS Import @Wormnest noted remaining regressions after 8faad92e. The second fread() only runs if the DDSD_PITCH flag is set, so the error handling check should also be conditional. Additionally, the ZDI-CAN-22093 exploit no longer runs but still could cause a plug-in crash. This patch adds an additional check to ensure the buffer size was within bounds.
2023-10-29 03:54:08 +08:00
if (size > (file_size - current_position) ||
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
size > load_info->linear_size)
plug-ins: Fix DDS import regression from 6ad54ca3 @Wormnest pointed out that compressed files are likely smaller than width * height * bps, so our check to prevent ZDI-CAN-22093 also caught valid files. The size check is removed from load_image () and moved to load_layer () before the two fread() functions, as we know exactly how much we'll try to read at that point.
2023-10-28 03:24:18 +08:00
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Requested data exceeds size of file.\n"));
return FALSE;
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info->flags & DDSD_LINEARSIZE) &&
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
! fread (buf, size, 1, fp))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: file-dds (read) cleaned up a bit for better error handling. Fatal errors should not be done with g_message(), but by setting the returned GError appropriately. The main GError must therefore be passed through functions. Some non-fatal warnings may still be outputted with g_message() if we want people to be aware of them (for instance if we managed to load some data yet there might have been data loss or errors). Finally when we are confident that we recovered from the format error, it is still nice to output some error on standard error (not be totally silent about it), but probably not need to bother people with popups. See #5357. Also clean up C++-style comments into C-style, to follow our coding style. Note: I only cleaned ddsread as a continuation of commit 81a3370e1d. I expect ddswrite to have similar issues, but I did not look at it.
2020-07-26 19:32:18 +08:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Unexpected EOF.\n"));
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! (load_info->fmt_flags & DDPF_FOURCC)) /* Read uncompressed pixel data */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guint rowstride = width * load_info->bpp;
guint32 sign_add[4] = { 0, 0, 0, 0 };
guint idx_r = 0, idx_b = 2;
plug-ins: fix #6755 DDS RGB10A2 has Red and Blue swapped. Looking at the documentation it is indeed red that should go in the lowest bits and blue in the highest bits so just reverse our code for red and blue. We also update the version of our GIMP DDS plug-in, this way we can catch and correct RGB10A2 images written by older versions of our plug-in and correct them.
2021-04-24 02:26:35 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Prior plug-in versions (3.9.91 and earlier) wrote the R and G channels reversed for RGB10A2. */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info->gimp_version > 0) &&
(load_info->gimp_version <= 199003) &&
(load_info->d3d9_format == D3DFMT_A2R10G10B10))
plug-ins: fix #6755 DDS RGB10A2 has Red and Blue swapped. Looking at the documentation it is indeed red that should go in the lowest bits and blue in the highest bits so just reverse our code for red and blue. We also update the version of our GIMP DDS plug-in, this way we can catch and correct RGB10A2 images written by older versions of our plug-in and correct them.
2021-04-24 02:26:35 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
g_printerr ("Switching incorrect red and green channels in RGB10A2 DDS "
"written by an older version of GIMP's DDS plug-in.\n");
idx_r = 2;
idx_b = 0;
plug-ins: fix #6755 DDS RGB10A2 has Red and Blue swapped. Looking at the documentation it is indeed red that should go in the lowest bits and blue in the highest bits so just reverse our code for red and blue. We also update the version of our GIMP DDS plug-in, this way we can catch and correct RGB10A2 images written by older versions of our plug-in and correct them.
2021-04-24 02:26:35 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Set up offset to apply to signed integer formats
* Per-channel to accommodate for mixed formats */
if (load_info->read_info.is_signed &&
(! load_info->read_info.is_float))
plug-ins: move unchanging code out of the loop in dds load_layer Optimize dds loading a bit by moving code that doesn't change outside the loop: 1. The number of bits to be shifted when the source isn't exactly 8 or 16 bits depends on bytes per sample and isn't changing inside the loop. 2. Use rowstride variable to compute width * d->bpp once. 3. The check for rowstride > hdr->pitch_or_linsize doesn't change inside the loop so move it out. Inside the loop we only check the DDSD_PITCH flag once and move both the size check and the fread check inside it.
2023-11-03 02:01:19 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.output_bit_depth == 8)
{
sign_add[0] = 128;
sign_add[1] = 128;
if (! (load_info->d3d9_format == D3DFMT_L6V5U5 ||
load_info->d3d9_format == D3DFMT_X8L8V8U8))
sign_add[2] = 128;
sign_add[3] = 128;
}
else if (load_info->read_info.output_bit_depth == 16)
{
sign_add[0] = 32768;
sign_add[1] = 32768;
sign_add[2] = 32768;
if (! (load_info->d3d9_format == D3DFMT_A2W10V10U10 ||
load_info->dxgi_format == DXGI_FORMAT_R10G10B10_SNORM_A2_UNORM))
sign_add[3] = 32768;
}
else /* load_info->read_info.output_bit_depth == 32 */
{
sign_add[0] = 2147483648;
sign_add[1] = 2147483648;
sign_add[2] = 2147483648;
sign_add[3] = 2147483648;
}
plug-ins: move unchanging code out of the loop in dds load_layer Optimize dds loading a bit by moving code that doesn't change outside the loop: 1. The number of bits to be shifted when the source isn't exactly 8 or 16 bits depends on bytes per sample and isn't changing inside the loop. 2. Use rowstride variable to compute width * d->bpp once. 3. The check for rowstride > hdr->pitch_or_linsize doesn't change inside the loop so move it out. Inside the loop we only check the DDSD_PITCH flag once and move both the size check and the fread check inside it.
2023-11-03 02:01:19 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info->flags & DDSD_PITCH) && (rowstride > load_info->pitch))
plug-ins: move unchanging code out of the loop in dds load_layer Optimize dds loading a bit by moving code that doesn't change outside the loop: 1. The number of bits to be shifted when the source isn't exactly 8 or 16 bits depends on bytes per sample and isn't changing inside the loop. 2. Use rowstride variable to compute width * d->bpp once. 3. The check for rowstride > hdr->pitch_or_linsize doesn't change inside the loop so move it out. Inside the loop we only check the DDSD_PITCH flag once and move both the size check and the fread check inside it.
2023-11-03 02:01:19 +08:00
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Requested data exceeds size of file.\n"));
return FALSE;
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
for (y = 0, n = 0; y < height; ++y, ++n)
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
if (n >= load_info->tile_height)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
gegl_buffer_set (buffer, GEGL_RECTANGLE (0, y - n, layerw, n), 0,
bablfmt, pixels, GEGL_AUTO_ROWSTRIDE);
n = 0;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
gimp_progress_update ((gdouble) y / (gdouble) load_info->height);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->flags & DDSD_PITCH)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: move unchanging code out of the loop in dds load_layer Optimize dds loading a bit by moving code that doesn't change outside the loop: 1. The number of bits to be shifted when the source isn't exactly 8 or 16 bits depends on bytes per sample and isn't changing inside the loop. 2. Use rowstride variable to compute width * d->bpp once. 3. The check for rowstride > hdr->pitch_or_linsize doesn't change inside the loop so move it out. Inside the loop we only check the DDSD_PITCH flag once and move both the size check and the fread check inside it.
2023-11-03 02:01:19 +08:00
current_position = ftell (fp);
if (rowstride > (file_size - current_position))
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Requested data exceeds size of file.\n"));
return FALSE;
}
if (! fread (buf, rowstride, 1, fp))
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Unexpected EOF.\n"));
return FALSE;
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
for (x = 0; x < layerw; ++x)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guint pos = (n * layerw + x) * load_info->gimp_bpp;
guint buf_reads = 0;
guchar read_buf;
guint32 ch_registers[4];
memset (ch_registers, 0, sizeof (ch_registers));
/* Format-agnostic bit-reader, driven by the 'format_read_info' table.
* Reads one bit at a time from source bytes into per-channel registers.
* While somewhat simplistic, reading bit-by-bit allows us to handle channels
* that cross byte boundaries trivially, and without the need for look-ahead.
*/
read_buf = *buf;
for (gint reg = 0; reg < 4; reg++)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
const guchar ch = load_info->read_info.channel_order[reg];
const guchar ch_bits = load_info->read_info.channel_bits[reg];
const guint32 write_bit = 1 << (ch_bits - 1);
plug-ins: fix #10240 DDS saved as RGB10A2 loads incorrectly There were 2 issues here: 1. When more than 8 bits per sample are used, a previous commit changed it so that we would be using 16-bit integer mode instead of 8-bit. However, the actual code for this specific format was not updated to reflect that. We fix this by computing 16-bits per channel values and upshifting the 10 and 2-bit samples to 16 bit per channel. 2. The computation of masks was incorrect. It computed each channel mask separately, based on whether it was <= 8 or not. However, if any channel needs more than 8 bits, all masks should be computed 16 bits since we will then 16-bit integer mode. We fix this by checking all channel bits together, and if any is higher than 8, but not more than 16, we use 16-bit masks. I also took this opportunity to add support for 32-bit masks if we ever need those.
2023-11-02 03:24:02 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! ch_bits) continue;
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Note: bits are written to the registers in the opposite order they're read in */
for (gint bit = 0; bit < ch_bits; bit++)
plug-ins: support loading DDS with two 16-bit channels. We have some examples of DDS images that have two 16-bit channels that we could not load. This commit adds checks to see if we need 16-bit channels, and conversion of the input to a correct 16-bit red, green, blue or alpha channel.
2022-05-03 05:24:09 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
ch_registers[ch] >>= 1;
ch_registers[ch] |= read_buf & 1 ? write_bit : 0;
read_buf >>= 1;
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
buf_reads++;
if (buf_reads == 8)
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Roll-over to next byte */
buf++;
read_buf = *buf;
buf_reads = 0;
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Most DXGI small-float formats have 5 exponent bits, so can be interpreted as 16-bit floats with a simple shift.
* Integers meanwhile must be properly requantized to the output range */
if (load_info->read_info.is_float)
{
guint shift = load_info->read_info.output_bit_depth - ch_bits;
if (load_info->dxgi_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP ||
load_info->dxgi_format == DXGI_FORMAT_R10G10B10_7E3_A2_FLOAT ||
load_info->dxgi_format == DXGI_FORMAT_R10G10B10_6E4_A2_FLOAT)
/* Skip shifting for float formats that require special handling */
shift = 0;
else if (! load_info->read_info.is_signed)
/* Don't shift into sign bit for unsigned floats, eg. R11G11B10 */
shift -= 1;
ch_registers[ch] = ch_registers[ch] << shift;
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
}
else
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
ch_registers[ch] = requantize_component (ch_registers[ch], ch_bits,
load_info->read_info.output_bit_depth);
plug-ins: add support for loading DDS 16- and 32-bit per channel RGBA This adds support for loading RGBA DDS images with 16- and 32-bit per channel. Loading is supported for 16-bit half float, 32-bit float, 16 and 32-bit unsigned and signed int. This supports both the DX10 formats and the D3D FOURCC versions. 16- and 32-bit per channel images with less than 4 channels are not yet supported.
2023-11-07 05:28:29 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Special cases for formats requiring extra decoding */
if (load_info->dxgi_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP)
float_from_9e5 (ch_registers);
else if (load_info->dxgi_format == DXGI_FORMAT_R10G10B10_7E3_A2_FLOAT)
float_from_7e3a2 (ch_registers);
else if (load_info->dxgi_format == DXGI_FORMAT_R10G10B10_6E4_A2_FLOAT)
float_from_6e4a2 (ch_registers);
else if (load_info->d3d9_format == D3DFMT_CxV8U8)
reconstruct_z (ch_registers);
/* Clear alpha to all 1s instead of all 0s */
if (! load_info->read_info.use_alpha)
ch_registers[3] = G_MAXUINT32;
/* Output converted values to canvas pixels */
if (load_info->read_info.gimp_type == GIMP_RGB)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.output_bit_depth == 8)
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guchar *pixel8 = (guchar *) &pixels[pos];
pixel8[0] = ch_registers[0] + sign_add[0];
pixel8[1] = ch_registers[1] + sign_add[1];
pixel8[2] = ch_registers[2] + sign_add[2];
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
pixel8[3] = ch_registers[3] + sign_add[3];
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (load_info->read_info.output_bit_depth == 16)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Variable indices for R and B to accommodate RGB10A2 fixup */
guint16 *pixel16 = (guint16 *) &pixels[pos];
pixel16[0] = ch_registers[idx_r] + sign_add[0];
pixel16[1] = ch_registers[1] + sign_add[1];
pixel16[2] = ch_registers[idx_b] + sign_add[2];
if (load_info->read_info.use_alpha)
pixel16[3] = ch_registers[3] + sign_add[3];
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* load_info->read_info.output_bit_depth == 32 */
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guint32 *pixel32 = (guint32 *) &pixels[pos];
pixel32[0] = (guint64) ch_registers[0] + sign_add[0];
pixel32[1] = (guint64) ch_registers[1] + sign_add[1];
pixel32[2] = (guint64) ch_registers[2] + sign_add[2];
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
pixel32[3] = (guint64) ch_registers[3] + sign_add[3];
plug-ins: fix #8942 add DDS support for reading R8G8, R16 and R16G16 formats In addition to the requested DXGI variants we also load the older D3DF versions, including handling of the signed versions. We also set signed when the pixelformat flag DDPF_BUMPDUDV (added in the previous commit) is set.
2023-11-10 07:40:37 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
}
else if (load_info->read_info.gimp_type == GIMP_GRAY)
{
if (load_info->read_info.output_bit_depth == 8)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guchar *pixel8 = (guchar *) &pixels[pos];
pixel8[0] = ch_registers[0] + sign_add[0];
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
pixel8[1] = ch_registers[3] + sign_add[3];
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else if (load_info->read_info.output_bit_depth == 16)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guint16 *pixel16 = (guint16 *) &pixels[pos];
pixel16[0] = ch_registers[0] + sign_add[0];
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
pixel16[1] = ch_registers[3] + sign_add[3];
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* load_info->read_info.output_bit_depth == 32 */
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
guint32 *pixel32 = (guint32 *) &pixels[pos];
pixel32[0] = (guint64) ch_registers[0] + sign_add[0];
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->read_info.use_alpha)
pixel32[1] = (guint64) ch_registers[3] + sign_add[3];
plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit. So far all dds images were loaded as 8 bit per channel which makes sense for most but not all dds formats. This commit implements loading in 16 bit for "L16" - a 16 bit luminance channel. In addition to that we improve security a bit by not assuming that L16 is the only left over case but instead explicitly checking the correct value of rmask for L16. For other cases we now set an error with enough details to identify the type of DDS image that needs extra handling.
2021-04-27 05:34:18 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* load_info->read_info.gimp_type == GIMP_INDEXED */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
pixels[pos] = ch_registers[0] & 0xFF;
if (load_info->read_info.use_alpha)
pixels[pos + 1] = ch_registers[3] & 0xFF;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
gegl_buffer_set (buffer, GEGL_RECTANGLE (0, y - n, layerw, n), 0,
bablfmt, pixels, GEGL_AUTO_ROWSTRIDE);
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else /* Read compressed pixel data */
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guchar *dst;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
dst = g_malloc (width * height * load_info->gimp_bpp);
memset (dst, 0, width * height * load_info->gimp_bpp);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
/* Initialize alpha to all 1s instead of all 0s */
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
if (load_info->gimp_bpp == 4)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
for (y = 0; y < height; ++y)
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
{
for (x = 0; x < width; ++x)
{
dst[y * (width * 4) + (x * 4) + 3] = 255;
}
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
dxt_decompress (dst, buf, load_info->comp_format, size, width, height,
load_info->gimp_bpp, load_info->fmt_flags & DDPF_NORMAL);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
/* Prior plug-in versions (before 3.9.90) wrote the R and G channels reversed for BC5. */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if ((load_info->gimp_version > 0) &&
(load_info->gimp_version <= 199002) &&
(load_info->comp_format == DDS_COMPRESS_BC5))
plug-ins: fix incorrect dds BC5 images saved by GIMP. Since older versions of our GIMP dds file exporter incorrectly saved BC5 dds images with the red and green channels swapped we should fix that. Since the exporter already wrote the plug-ins version number and that it is written by GIMP we can check for these incorrect images. To enable that we increase the plug-ins revision in this commit and swap red and green channels for images that have an older version number and are of the correct type.
2021-01-06 06:48:35 +08:00
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
g_printerr ("Switching incorrect red and green channels in BC5 DDS "
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
"written by an older version of GIMP's DDS plug-in.\n");
plug-ins: fix incorrect dds BC5 images saved by GIMP. Since older versions of our GIMP dds file exporter incorrectly saved BC5 dds images with the red and green channels swapped we should fix that. Since the exporter already wrote the plug-ins version number and that it is written by GIMP we can check for these incorrect images. To enable that we increase the plug-ins revision in this commit and swap red and green channels for images that have an older version number and are of the correct type.
2021-01-06 06:48:35 +08:00
for (y = 0; y < height; ++y)
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
{
for (x = 0; x < width; ++x)
{
guchar tmpG;
guint pix_width = width * load_info->gimp_bpp;
guint x_width = x * load_info->gimp_bpp;
tmpG = dst[y * pix_width + x_width];
dst[y * pix_width + x_width] = dst[y * pix_width + x_width + 1];
dst[y * pix_width + x_width + 1] = tmpG;
}
}
plug-ins: fix incorrect dds BC5 images saved by GIMP. Since older versions of our GIMP dds file exporter incorrectly saved BC5 dds images with the red and green channels swapped we should fix that. Since the exporter already wrote the plug-ins version number and that it is written by GIMP we can check for these incorrect images. To enable that we increase the plug-ins revision in this commit and swap red and green channels for images that have an older version number and are of the correct type.
2021-01-06 06:48:35 +08:00
}
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
for (y = 0, n = 0; y < height; ++y, ++n)
{
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
if (n >= load_info->tile_height)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
gegl_buffer_set (buffer, GEGL_RECTANGLE (0, y - n, layerw, n), 0,
bablfmt, pixels, GEGL_AUTO_ROWSTRIDE);
n = 0;
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
gimp_progress_update ((gdouble) y / (gdouble) load_info->height);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
memcpy (pixels + n * layerw * load_info->gimp_bpp,
dst + y * layerw * load_info->gimp_bpp,
width * load_info->gimp_bpp);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
gegl_buffer_set (buffer, GEGL_RECTANGLE (0, y - n, layerw, n), 0,
bablfmt, pixels, GEGL_AUTO_ROWSTRIDE);
g_free (dst);
}
gegl_buffer_flush (buffer);
g_object_unref (buffer);
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
/* Decode files with GIMP-specific encodings */
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (load_info->gimp_version > 0)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
switch (GETL32 (load_info->gimp_fourcc))
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
case FOURCC ('A','E','X','P'):
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
decode_alpha_exponent (GIMP_DRAWABLE (layer));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
break;
case FOURCC ('Y','C','G','1'):
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
decode_ycocg (GIMP_DRAWABLE (layer));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
break;
case FOURCC ('Y','C','G','2'):
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
decode_ycocg_scaled (GIMP_DRAWABLE (layer));
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
break;
default:
break;
}
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return TRUE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_mipmaps (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
gboolean read_mipmaps,
GError **error)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
guint level;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (read_mipmaps)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
for (level = 1; level < load_info->mipmaps; ++level)
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_layer (fp, load_info, image, level, prefix, layer_index,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
pixels, buf, error))
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
}
}
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
else
{
/* Skip past mipmaps, as simply not reading them leaves us in the wrong pos for subsequent layers */
for (level = 1; level < load_info->mipmaps; ++level)
{
guint width = MAX (1, load_info->width >> level);
guint height = MAX (1, load_info->height >> level);
guint size = load_info->linear_size >> (2 * level);
if (load_info->fmt_flags & DDPF_FOURCC)
{
size = ((width + 3) >> 2) * ((height + 3) >> 2);
if ((load_info->comp_format == DDS_COMPRESS_BC1) ||
(load_info->comp_format == DDS_COMPRESS_BC4))
size *= 8;
else
size *= 16;
}
fseek (fp, size, SEEK_CUR);
}
}
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return TRUE;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
static gboolean
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
load_face (FILE *fp,
dds_load_info_t *load_info,
GimpImage *image,
gchar *prefix,
guint *layer_index,
guchar *pixels,
guchar *buf,
gboolean read_mipmaps,
GError **error)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
if (! load_layer (fp, load_info, image, 0, prefix,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
layer_index, pixels, buf, error))
plug-ins: more file-dds cleanup
2019-10-01 00:50:23 +08:00
return FALSE;
plug-ins: big formatting and indentation cleanup in file-dds Also change the license to GPL 3 or later, like all other files.
2019-05-23 20:34:00 +08:00
plug-ins: DDS import rewrite Comprehensive rewrite of the DDS import routine, in the interest of easier maintainability and readability. Adds formats.c/h, containing tables and functions related to reading and parsing uncompressed files. Importer now supports nearly all non-video uncompressed formats. Includes a variety of minor-to-moderate fixes made along the way which could not be pulled out into separate commits due to dependence on other aspects of the rewrite.
2023-12-11 07:40:17 +08:00
return load_mipmaps (fp, load_info, image, prefix, layer_index,
Consolidate YCoCg/AlphaExp code, always decode Moves most of the code relating to YCoCg and Alpha Exponent into misc.c/h, in the interest of making the rest of the codebase cleaner. Removes the decode option from the import menu, as encoded files are always decoded now (there used to be a menu button for doing this after import, but with it gone there's no reason ever to not decode). Finally, the remaining functions in color.c were only ever called once, so these were extracted and inlined, and the empty file deleted.
2023-11-26 10:47:49 +08:00
pixels, buf, read_mipmaps, error);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
static gboolean
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
load_dialog (GimpProcedure *procedure,
GimpProcedureConfig *config)
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
{
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
GtkWidget *dialog;
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
GtkWidget *vbox;
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
gboolean run;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
dialog = gimp_procedure_dialog_new (procedure,
ddsread and ddswrite cleanup and commenting Extensive formatting and cleanup in the read-write files, and addition of some comments where they seemed appropriate. Renamed a couple of single-letter variables to be more descriptive. Also removed an unnecessary global variable in ddswrite.c, and made the "config" variable in ddsread a GimpProcedureConfig type, as was previously done for ddswrite.
2023-11-26 10:47:48 +08:00
config,
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
_("Open DDS"));
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: Port DDS load dialog widgets to use... GimpProcedureDialog APIs. Also add mnemonics.
2023-04-01 10:03:55 +08:00
vbox = gimp_procedure_dialog_fill_box (GIMP_PROCEDURE_DIALOG (dialog),
"dds-read-box",
"load-mipmaps",
plug-ins: add option to vertically flip dds image on import Some games apparently need dds images to be vertically flipped. We already have an option to flip dds images on export, so it makes sense to also allow flipping on import.
2023-11-11 02:40:29 +08:00
"flip-image",
plug-ins: Port DDS load dialog widgets to use... GimpProcedureDialog APIs. Also add mnemonics.
2023-04-01 10:03:55 +08:00
NULL);
gtk_box_set_spacing (GTK_BOX (vbox), 8);
plug-ins: a lot of coding style cleanup in file-dds. Still a lot more to do but pushing WIP to not have it wasted if more commits come in from others. Also got rid of some global variables.
2019-01-03 04:32:17 +08:00
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
plug-ins: Port DDS load dialog widgets to use... GimpProcedureDialog APIs. Also add mnemonics.
2023-04-01 10:03:55 +08:00
gimp_procedure_dialog_fill (GIMP_PROCEDURE_DIALOG (dialog),
"dds-read-box", NULL);
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
gtk_widget_show (dialog);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: port file-dds-load to GimpProcedureConfig
2019-10-02 05:31:06 +08:00
run = gimp_procedure_dialog_run (GIMP_PROCEDURE_DIALOG (dialog));
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
gtk_widget_destroy (dialog);
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
plug-ins: same cleanup in the DDS load dialog and some more general cleanups.
2019-09-30 21:28:42 +08:00
return run;
file-dds: add original source code of the DDS plug-in This is the code from the 'gimp-2.9' branch of the plug-in, integrated into GIMP's build system.
2018-11-13 07:35:07 +08:00
}