Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ jobs:
linux:
runs-on: ubuntu-latest

permissions:
contents: write

env:
GIT_LFS_SKIP_SMUDGE: 1
WERROR: ON
Expand Down Expand Up @@ -129,7 +132,7 @@ jobs:
sha1sum $zip_basename.zip > $zip_basename.zip.sha1

- name: Upload To Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: github.event_name == 'push' && github.ref_type == 'tag'
with:
draft: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
linux:
permissions:
packages: write
contents: write
# Shortcircuit and don't burn CI time when formatting will reject
#needs: formatting
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
macos:
permissions:
packages: write
contents: write
# Shortcircuit and don't burn CI time when formatting will reject
#needs: formatting
strategy:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
#formatting:
# uses: ./.github/workflows/formatting.yml
web:
permissions:
contents: write
# Shortcircuit and don't burn CI time when formatting will reject
#needs: formatting
strategy:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
windows:
permissions:
packages: write
contents: write
# Shortcircuit and don't burn CI time when formatting will reject
#needs: formatting
strategy:
Expand Down Expand Up @@ -375,7 +376,7 @@ jobs:
path: ${{env.BUILD_DIR}}/${{env.PYTHON_DIST_DIR}}

- name: Upload to Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: matrix.options.package == 'YES' && matrix.toolset == 'CLangCL' && github.event_name == 'push' && github.ref_type == 'tag'
with:
draft: true
Expand Down
259 changes: 99 additions & 160 deletions RELEASE_NOTES.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmake/License.rtf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf2513
{\rtf1\ansi\ansicpg1252\cocoartf2822
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;}
Expand All @@ -16,4 +16,4 @@ Unless required by applicable law or agreed to in writing, software distributed
\pard\pardeftab720\sa140\partightenfactor0
\cf2 \
\pard\pardeftab720\sa280\partightenfactor0
\cf2 libktx is the work of Mark Callow based on work by Georg Kolling and Jacob Str\'f6m with contributions borrowed from Troy Hanson, Johannes van Waveren, Lode Vandevenne and Rich Geldreich. The tools are the work of Mark Callow. The CMake-based build setup used to produce this installer is the work of Andreas Atteneder.}
\cf2 libktx is the work of Mark Callow based on work by Georg Kolling and Jacob Str\'f6m with contributions borrowed from Troy Hanson, Johannes van Waveren, Lode Vandevenne and Rich Geldreich. The KTX tool suite is the work of RasterGrid Kft. The legacy tools are the work of Mark Callow. The CMake-based build setup used to produce this installer is the work of Andreas Atteneder.}
46 changes: 27 additions & 19 deletions cmake/ReadMe.rtf
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
{\rtf1\ansi\ansicpg1252\cocoartf2513
{\rtf1\ansi\ansicpg1252\cocoartf2822
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;\f1\fnil\fcharset0 LucidaGrande;\f2\fnil\fcharset0 HelveticaNeue-Italic;
\f3\fnil\fcharset0 HelveticaNeue-Bold;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{square\}}{\leveltext\leveltemplateid1\'01\uc0\u9642 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid2\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listname ;}\listid1}
{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{square\}}{\leveltext\leveltemplateid101\'01\uc0\u9642 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid102\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listname ;}\listid2}}
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
\paperw11900\paperh16840\margl1440\margr1440\vieww19120\viewh13180\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0

\f0\fs26 \cf2 This will install the following KTX tools:\
\f0\fs26 \cf2 This will install the following:\
\
\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\pardirnatural\partightenfactor0
\ls1\ilvl0\cf2 {\listtext
\f1 \uc0\u9642
\f0 }ktx2check - Check KTX v2 files for validity.\
{\listtext
\f1 \uc0\u9642
\f0 }ktxinfo - Print info about a KTX file in human-readable form.\
{\listtext
\f1 \uc0\u9642
\f0 }ktx2ktx2 - Convert a KTX v1 file to a KTX v2 file.\
{\listtext
\f1 \uc0\u9642
\f0 }ktxsc - Supercompress a KTX v2 file.\
{\listtext
\f1 \uc0\u9642
\f0 }toktx - Create a KTX v1 or v2 file from .jpg, .png or Netpbm images.\

\f1 \cf2 \uc0\u9642
\f0 ktx - Unified front end for the KTX tool suite:\
\pard\tx940\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-1440\pardirnatural\partightenfactor0
\ls1\ilvl1\cf2 {\listtext \uc0\u8259 }create - Create KTX v2 files.\
{\listtext \uc0\u8259 }compare - Compare KTX v2 files.\
{\listtext \uc0\u8259 }deflate - Apply Zstd or ZLIB compression to a KTX v2 file.\
{\listtext \uc0\u8259 }encode - Encode a KTX v2 file to Basis Universal or ASTC.\
{\listtext \uc0\u8259 }extract - Extract an image from a KTX v2 file.\
{\listtext \uc0\u8259 }info - Display info about a KTX file.\
{\listtext \uc0\u8259 }transcode - Transcode a KTX v2 file.\
{\listtext \uc0\u8259 }validate - Validate a KTX v2 file.\
\pard\tx220\tx720\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li720\fi-720\pardirnatural\partightenfactor0

\f1 \cf2 \uc0\u9642
\f0 Legacy tools which will be removed in the next release:\
\pard\tx940\tx1440\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li1440\fi-1440\pardirnatural\partightenfactor0
\ls2\ilvl1\cf2 {\listtext \uc0\u8259 }ktx2check - Check KTX v2 files for validity.\
{\listtext \uc0\u8259 }ktxinfo - Print info about a KTX file in human-readable form.\
{\listtext \uc0\u8259 }ktx2ktx2 - Convert a KTX v1 file to a KTX v2 file.\
{\listtext \uc0\u8259 }ktxsc - Supercompress a KTX v2 file.\
{\listtext \uc0\u8259 }toktx - Create a KTX v1 or v2 file from .jpg, .png or Netpbm images.\
\pard\tx566\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf2 \
By clicking the
Expand Down
2 changes: 1 addition & 1 deletion lib/libktx_mainpage.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For information about the KTX format see the
formal specification.</a>

@authors
<a href="http://github.com/MarkCallow">Mark Callow/a>,
<a href="http://github.com/MarkCallow">Mark Callow</a>,
formerly at <a href="http://www.hicorp.co.jp">HI Corporation</a>\n
Mátyás Császár and Daniel Rákos, <a href="https://www.rastergrid.com/">RasterGrid</a>\n
Wasim Abbas, <a href="https://www.arm.com/">Arm</a>\n
Expand Down