From ea4f7e9dc27044001a72597103f09d9607177ce1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Apr 2016 17:39:20 +1000 Subject: [PATCH] Cleanup: gcc's -Wcomment warnings --- toonz/sources/common/psdlib/psd.h | 12 ++++++------ toonz/sources/common/tfx/tcacheresource.cpp | 4 ++-- toonz/sources/image/psd/tiio_psd.cpp | 10 +++++----- toonz/sources/include/toonzqt/gutil.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/toonz/sources/common/psdlib/psd.h b/toonz/sources/common/psdlib/psd.h index 13ab5a3a..012050d2 100644 --- a/toonz/sources/common/psdlib/psd.h +++ b/toonz/sources/common/psdlib/psd.h @@ -256,12 +256,12 @@ class DVAPI TPSDParser public: // path define levels construction method // if path = : - // filename.psd flat image so LevelsCount = 1; - // filename#LAYERID.psd each psd layer as a tlevel - // filename#LAYERID#frames.psd each psd layer as a frame so there is only one tlevel with 1 or more frames; - // filename#LAYERID#folder.psd each psd layer is a tlevel and \ - // each folder is a tlevel such as the psd layers \ - // contained into folder are frames of tlevel + // filename.psd flat image so LevelsCount = 1; + // filename#LAYERID.psd each psd layer as a tlevel + // filename#LAYERID#frames.psd each psd layer as a frame so there is only one tlevel with 1 or more frames; + // filename#LAYERID#folder.psd each psd layer is a tlevel and + // each folder is a tlevel such as the psd layers + // contained into folder are frames of tlevel // LAYERID(Integer) is psd layerId TPSDParser(const TFilePath &path); ~TPSDParser(); diff --git a/toonz/sources/common/tfx/tcacheresource.cpp b/toonz/sources/common/tfx/tcacheresource.cpp index 4ef73f08..b5d0a1f0 100644 --- a/toonz/sources/common/tfx/tcacheresource.cpp +++ b/toonz/sources/common/tfx/tcacheresource.cpp @@ -979,9 +979,9 @@ void TCacheResource::clear() } /* -//**************************************************************************************************** +// *************************************************************************************************** // Disk reference -//**************************************************************************************************** +// *************************************************************************************************** #include diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index e0916041..1e48db30 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -8,11 +8,11 @@ //class TImageReaderLayerPsd; // if path = : -// filename.psd to load float image. TLevel frames number is 1 -// filename#layerId.psd to load only one psd layer from layerId. TLevel frames number is 1 -// filename#layerId#frames.psd to load only one psd layer from layerId. TLevel frames number is psd layers number -// filename#layerId#group.psd to load only one psd layer from layerId. TLevel frames number is psd layers folder number \ -// where fodler is the folder belongs psd layer. +// filename.psd to load float image. TLevel frames number is 1 +// filename#layerId.psd to load only one psd layer from layerId. TLevel frames number is 1 +// filename#layerId#frames.psd to load only one psd layer from layerId. TLevel frames number is psd layers number +// filename#layerId#group.psd to load only one psd layer from layerId. TLevel frames number is psd layers folder number +// where fodler is the folder belongs psd layer. TLevelReaderPsd::TLevelReaderPsd(const TFilePath &path) : TLevelReader(path), m_path(path), m_layerId(0) diff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.h index 45613eeb..896e9c12 100644 --- a/toonz/sources/include/toonzqt/gutil.h +++ b/toonz/sources/include/toonzqt/gutil.h @@ -47,11 +47,11 @@ class TFilePath; class QPainterPath; class TStroke; -//-----------------------------------------------------------------------------\ +//----------------------------------------------------------------------------- QString DVAPI fileSizeString(qint64 size, int precision = 2); -//-----------------------------------------------------------------------------\ +//----------------------------------------------------------------------------- QImage DVAPI rasterToQImage(const TRasterP &ras, bool premultiplied = true, bool mirrored = true);