birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gems/Atom

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 17:57:02 -07:00
parent 257557c692
commit c19c4af1e1
23 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
-1
View File
@@ -133,7 +133,6 @@ namespace ImageProcessingAtom
IImageObjectPtr C3dLutColorChart::GenerateChartImage()
{
const AZ::u32 mipCount = 1;
IImageObjectPtr image(IImageObject::CreateImage(ePS_Red* ePS_Blue, ePS_Green, 1, ePixelFormat_R8G8B8A8));
{
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
+7 -7
View File
@@ -209,18 +209,18 @@ namespace ImageProcessingAtom
/* addition of c-pointers already takes care of datatype-sizes */ \
const signed long int dy = /*parm->mirror ? -1 :*/ 1; \
const unsigned int stridei = parm->incols * 1 * 1; \
const unsigned int stridet = parm->subcols * 1 * 1; \
const unsigned int strideo = parm->outcols * 1 * 1; \
[[maybe_unused]] const unsigned int stridet = parm->subcols * 1 * 1; \
[[maybe_unused]] const unsigned int strideo = parm->outcols * 1 * 1; \
/* offset and shift calculations still require the unmodified values */ \
const unsigned int strideiraw = parm->incols; \
const unsigned int stridetraw = parm->subcols; \
[[maybe_unused]] const unsigned int stridetraw = parm->subcols; \
const unsigned int strideoraw = parm->outcols; \
\
class Plane2D<dtyp> tmp(tmpcols, tmprows, 4); \
dtyp*** t = (dtyp***)tmp; \
int srcPos, dstPos; \
bool plusminush = false; const bool of = true; \
bool plusminusv = false; const bool nc = false; \
bool plusminush = false; [[maybe_unused]] const bool of = true; \
bool plusminusv = false; [[maybe_unused]] const bool nc = false; \
FilterWeights<wtyp>* fwh = calculateFilterWeights<wtyp>(parm->resample.colrem, parm->caged ? 0 : 0 - parm->region.subtop, parm->caged ? srccols : parm->subrows - parm->region.subtop, \
parm->resample.colquo, 0, dstcols, reps, parm->resample.colblur, parm->resample.wf, parm->resample.operation != eWindowEvaluation_Sum, plusminush); \
FilterWeights<wtyp>* fwv = calculateFilterWeights<wtyp>(parm->resample.rowrem, parm->caged ? 0 : 0 - parm->region.intop, parm->caged ? srcrows : parm->inrows - parm->region.intop, \
@@ -833,7 +833,7 @@ namespace ImageProcessingAtom
#define filterRowFetch(srcOffs, srcSize, srcSkip, dstOffs, dstSize, dstSkip) \
/* vertical stride, horizontal fetch */ \
getCxNFromStreamSwapped(srcSkip, i); \
/* getCxNFromStreamSwapped(srcSkip, i); Expands to nothing */ \
getCxNFromStream(srcSkip, i); \
getCxNFromPlane(1); \
\
@@ -935,7 +935,7 @@ namespace ImageProcessingAtom
comcpyCHistogram(); \
\
/* horizontal stride, vertical store */ \
putCxNToStreamSwapped(dstSkip, o); \
/* putCxNToStreamSwapped(dstSkip, o); Expands to nothing */ \
putCxNToStream(dstSkip, o); \
putCxNToPlane(1); \
\
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
-3
View File
@@ -58,9 +58,6 @@ namespace ImageProcessingAtom
// linear interpolation
FilterImage(MipGenType::triangle, MipGenEvalType::sum, 0.0f, 0.0f, m_img, dwMipDown, newImage, dstMip, NULL, NULL);
const AZ::u32 pixelCountIn = m_img->GetWidth(dstMip) * m_img->GetHeight(dstMip);
const AZ::u32 pixelCountOut = newImage->GetWidth(dstMip) * newImage->GetHeight(dstMip);
//substraction
AZ::u8* srcPixelBuf;
AZ::u32 srcPitch;