Minor changes to f24eb75298c118500ff4428661fe186eefdde2b2

src/app/cli/app_options.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of

src/app/cli/app_options.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of

src/app/cli/cli_open_file.cpp

@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2019  Igara Studio S.A.
 // Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of

src/app/cli/cli_open_file.h

@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2019  Igara Studio S.A.
 // Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of

src/app/cli/cli_processor.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -757,7 +757,6 @@ void CliProcessor::saveFile(Context* ctx, const CliOpenFile& cof)
         // Call delegate
         m_delegate->saveFile(ctx, itemCof);
 
-        // for trim or trimByGrid case
         if (cof.trim) {
           ctx->executeCommand(undoCommand);
           clearUndo = true;

src/app/cli/preview_cli_delegate.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (C) 2016-2018  David Capello
 //
 // This program is distributed under the terms of

src/app/commands/cmd_crop.cpp

@@ -102,7 +102,7 @@ AutocropSpriteCommand::AutocropSpriteCommand()
 {
 }
 
-void AutocropSpriteCommand::onLoadParams(const app::Params &params)
+void AutocropSpriteCommand::onLoadParams(const app::Params& params)
 {
   m_byGrid = false;
   if (params.has_param("byGrid")) {

src/app/doc_api.cpp

@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2019  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -158,7 +159,7 @@ void DocApi::cropSprite(Sprite* sprite, const gfx::Rect& bounds)
   }
 }
 
-void DocApi::trimSprite(Sprite* sprite, bool isByGrid)
+void DocApi::trimSprite(Sprite* sprite, const bool byGrid)
 {
   gfx::Rect bounds;
 
@@ -177,7 +178,8 @@ void DocApi::trimSprite(Sprite* sprite, bool isByGrid)
     if (doc::algorithm::shrink_bounds(image, frameBounds, get_pixel(image, 0, 0)))
       bounds = bounds.createUnion(frameBounds);
 
-    if (isByGrid) {
+    // TODO merge this code with the code in DocExporter::captureSamples()
+    if (byGrid) {
       Doc* doc = m_document;
       auto& docPref = Preferences::instance().document(doc);
       gfx::Point posTopLeft =

src/app/doc_api.h

@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2019  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -45,7 +46,7 @@ namespace app {
     void setSpriteSize(Sprite* sprite, int w, int h);
     void setSpriteTransparentColor(Sprite* sprite, color_t maskColor);
     void cropSprite(Sprite* sprite, const gfx::Rect& bounds);
-    void trimSprite(Sprite* sprite, bool isByGrid);
+    void trimSprite(Sprite* sprite, const bool byGrid);
 
     // Frames API
     void addFrame(Sprite* sprite, frame_t newFrame);

src/app/doc_exporter.cpp

@@ -603,6 +603,7 @@ void DocExporter::captureSamples(Samples& samples)
         }
 
         if (m_trimCels) {
+          // TODO merge this code with the code in DocApi::trimSprite()
           if (m_trimByGrid) {
             auto& docPref = Preferences::instance().document(doc);
             gfx::Point posTopLeft =