Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of a TIM2 coder #1571

Merged
merged 14 commits into from Jul 13, 2019

Conversation

@Qjammer
Copy link
Contributor

commented May 15, 2019

Prerequisites

  • I have written a descriptive pull-request title
  • I have verified that there are no overlapping pull-requests open
  • I have verified that I am following the existing coding patterns and practices as demonstrated in the repository.

Description

This pull request implements a coder for the TIM2 format used in PS2 videogames.

It can handle two format types (4.0, 4.1), three pixel depths (RGBA16, RGB24, RGBA32) with or without a CLUT (Color LookUp Table) of either 4 or 8 bit indices in either of two CLUT Storage Modes (CSM1, CSM2).

It does not handle mipmaps or multiple image files, as I haven't found an example to inspect.

@Qjammer

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

The build fails because automake needs to be run, since a new file has been added. I think the CI build should include the command $ automake to generate a new Makefile.in file, and then run $ configure as it does now.

Moreover, I don't understand why autogenerated files are commited in the git history, like the utilities/*.1 files or the Makefile.in, which are generated by $ ./configure and $ automake respectively.

I am therefore unsure if I should add a commit changing the autogenerated files, in particular, the Makefile.in

@urban-warrior urban-warrior merged commit 602ee2c into ImageMagick:master Jul 13, 2019
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
ImageMagick #20190515.1416 failed
Details
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Jul 19, 2019
This update contains a number of security fixes.

2019-07-16  7.0.8-54 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.8-54, GIT revision 15916:e868e22:20190716.

2019-07-08  7.0.8-54 Cristy  <quetzlzacatenango@image...>
   * resolve division by zero  (reference
     ImageMagick/ImageMagick#1629).
   * introducing MagickLevelImageColors() MagickWand method.
  * Transient problem with text placement with gravity (reference
    ImageMagick/ImageMagick#1633).
  * Support TIM2 image format (reference
    ImageMagick/ImageMagick#1571).
  * For -magnify option, specify an alternative scaling method with -define
	  magnify:method=method, choose from these methods: eagle2X, eagle3X,
    eagle3XB, epb2X, fish2X, hq2X,  scale2X (default), scale3X, xbr2X.

2019-07-05  7.0.8-53 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.8-53, GIT revision 15828:f5d59c0:20190705.

2019-07-05  7.0.8-53 Cristy  <quetzlzacatenango@image...>
   * Fix -fx parsing issue (reference
     https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36314).

2019-07-05  7.0.8-52 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.8-52, GIT revision 15825:ea47310:20190705.

2019-07-01  7.0.8-52 Cristy  <quetzlzacatenango@image...>
  * Eliminate buffer overflow in TranslateEvent() (reference
    ImageMagick/ImageMagick#1621).

2019-06-30  7.0.8-51 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.8-51, GIT revision 15812:51f11c4:20190630.

2019-06-24  7.0.8-51 Cristy  <quetzlzacatenango@image...>
  * Clone rather than copy X window name/icon.
  * Optimize PDF reader.

2019-06-23  7.0.8-50 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.8-50, GIT revision 15778:4a60519:20190623

2019-06-14  7.0.8-50 Dirk Lemstra <dirk@lem.....org>
  * Added support for reading all images from a HEIC image (reference
    ImageMagick/ImageMagick#1391).
  * Heap-buffer-overflow in MagickCore/fourier.c (reference
   ImageMagick/ImageMagick#1588).
  * Fixed a number of issues (reference
    https://imagemagick.org/discourse-server/viewforum.php?f=3).
  * Fixed a number of issues (reference
    https://github.com/ImageMagick/ImageMagick/issues).
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Jul 23, 2019
graphics/ImageMagick: security fix

Revisions pulled up:
- graphics/ImageMagick/Makefile.common                          1.191
- graphics/ImageMagick/distinfo                                 1.208

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Fri Jul 19 09:12:13 UTC 2019

   Modified Files:
   	pkgsrc/graphics/ImageMagick: Makefile.common distinfo

   Log Message:
   ImageMagick: Update to 7.0.8-54

   This update contains a number of security fixes.

   2019-07-16  7.0.8-54 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-54, GIT revision 15916:e868e22:20190716.

   2019-07-08  7.0.8-54 Cristy  <quetzlzacatenango@image...>
      * resolve division by zero  (reference
        ImageMagick/ImageMagick#1629).
      * introducing MagickLevelImageColors() MagickWand method.
     * Transient problem with text placement with gravity (reference
       ImageMagick/ImageMagick#1633).
     * Support TIM2 image format (reference
       ImageMagick/ImageMagick#1571).
     * For -magnify option, specify an alternative scaling method with -define
   	  magnify:method=method, choose from these methods: eagle2X, eagle3X,
       eagle3XB, epb2X, fish2X, hq2X,  scale2X (default), scale3X, xbr2X.

   2019-07-05  7.0.8-53 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-53, GIT revision 15828:f5d59c0:20190705.

   2019-07-05  7.0.8-53 Cristy  <quetzlzacatenango@image...>
      * Fix -fx parsing issue (reference
        https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36314).

   2019-07-05  7.0.8-52 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-52, GIT revision 15825:ea47310:20190705.

   2019-07-01  7.0.8-52 Cristy  <quetzlzacatenango@image...>
     * Eliminate buffer overflow in TranslateEvent() (reference
       ImageMagick/ImageMagick#1621).

   2019-06-30  7.0.8-51 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-51, GIT revision 15812:51f11c4:20190630.

   2019-06-24  7.0.8-51 Cristy  <quetzlzacatenango@image...>
     * Clone rather than copy X window name/icon.
     * Optimize PDF reader.

   2019-06-23  7.0.8-50 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.8-50, GIT revision 15778:4a60519:20190623

   2019-06-14  7.0.8-50 Dirk Lemstra <dirk@lem.....org>
     * Added support for reading all images from a HEIC image (reference
       ImageMagick/ImageMagick#1391).
     * Heap-buffer-overflow in MagickCore/fourier.c (reference
      ImageMagick/ImageMagick#1588).
     * Fixed a number of issues (reference
       https://imagemagick.org/discourse-server/viewforum.php?f=3).
     * Fixed a number of issues (reference
       https://github.com/ImageMagick/ImageMagick/issues).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.