/*
-Copyright (c) 2005-2006, John Hurst
+Copyright (c) 2005-2009, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
if ( Marker.m_DataSize != 0 && Marker.m_DataSize < 3 )
{
- DefaultLogSink().Error("Illegal data size: %lu\n", Marker.m_DataSize);
+ DefaultLogSink().Error("Illegal data size: %u\n", Marker.m_DataSize);
return ASDCP::RESULT_FAIL;
}
//
void
-ASDCP::JP2K::Accessor::SIZ::ReadComponent(ui32_t index, ASDCP::JP2K::ImageComponent& IC)
+ASDCP::JP2K::Accessor::SIZ::ReadComponent(ui32_t index, ASDCP::JP2K::ImageComponent_t& IC)
{
assert ( index < Csize() );
const byte_t* p = m_MarkerData + 36 + (index * 3);
fprintf(stream, "SIZ: \n");
fprintf(stream, " Rsize: %hu\n", Rsize());
- fprintf(stream, " Xsize: %lu\n", Xsize());
- fprintf(stream, " Ysize: %lu\n", Xsize());
- fprintf(stream, " XOsize: %lu\n", XOsize());
- fprintf(stream, " YOsize: %lu\n", XOsize());
- fprintf(stream, " XTsize: %lu\n", XTsize());
- fprintf(stream, " YTsize: %lu\n", XTsize());
- fprintf(stream, "XTOsize: %lu\n", XTOsize());
- fprintf(stream, "YTOsize: %lu\n", YTOsize());
- fprintf(stream, " Csize: %lu\n", Csize());
+ fprintf(stream, " Xsize: %u\n", Xsize());
+ fprintf(stream, " Ysize: %u\n", Xsize());
+ fprintf(stream, " XOsize: %u\n", XOsize());
+ fprintf(stream, " YOsize: %u\n", XOsize());
+ fprintf(stream, " XTsize: %u\n", XTsize());
+ fprintf(stream, " YTsize: %u\n", XTsize());
+ fprintf(stream, "XTOsize: %u\n", XTOsize());
+ fprintf(stream, "YTOsize: %u\n", YTOsize());
+ fprintf(stream, " Csize: %u\n", Csize());
if ( Csize() > 0 )
{
for ( ui32_t i = 0; i < Csize(); i++ )
{
- ImageComponent TmpComp;
+ ImageComponent_t TmpComp;
ReadComponent(i, TmpComp);
- fprintf(stream, "%lu: ", i);
- fprintf(stream, "%lu, %lu, %lu\n", TmpComp.Ssize, TmpComp.XRsize, TmpComp.YRsize);
+ fprintf(stream, "%u: ", i);
+ fprintf(stream, "%u, %u, %u\n", TmpComp.Ssize, TmpComp.XRsize, TmpComp.YRsize);
}
}
}