Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -638,7 +638,6 @@ namespace ImageProcessingAtom
            DDS_FILE_DESC desc;
            DDS_HEADER_DXT10 exthead;

-            AZ::IO::SizeType startPos = fileLoadStream.GetCurPos();
            fileLoadStream.Read(sizeof(desc), &desc);

            if (desc.dwMagic != FOURCC_DDS || !desc.IsValid())
@@ -119,8 +119,6 @@ namespace ImageProcessingAtom
                ImfMath::Box2i dw = header.dataWindow();
                width = dw.max.x - dw.min.x + 1;
                height = dw.max.y - dw.min.y + 1;
-                int dx = dw.min.x;
-                int dy = dw.min.y;

                // Create IImageObject
                IImageObject* newImage = IImageObject::CreateImage(width, height, 1, format);
@@ -36,7 +36,6 @@ namespace ImageProcessingAtom
            }

            //convert to format which compatiable our pixel format
-            QImage::Format format = qimage.format();
            if (qimage.format() != QImage::Format_RGBA8888)
            {
                qimage = qimage.convertToFormat(QImage::Format_RGBA8888);