[aseprite] 10/134: Remove unused variables
Tobias Hansen
thansen at moszumanska.debian.org
Sat Mar 14 17:09:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit bfe7a637dacab647a4caf6f856ec6492f2973688
Author: David Capello <davidcapello at gmail.com>
Date: Sat Oct 25 14:57:49 2014 -0300
Remove unused variables
---
src/app/commands/cmd_background_from_layer.cpp | 1 -
src/app/document_api.cpp | 4 +++-
src/app/document_range_ops.cpp | 1 -
src/app/ui/editor/pixels_movement.cpp | 1 -
src/app/ui/editor/pixels_movement.h | 1 -
src/app/ui/timeline.cpp | 2 --
src/app/util/clipboard.cpp | 1 -
7 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/app/commands/cmd_background_from_layer.cpp b/src/app/commands/cmd_background_from_layer.cpp
index bb916f4..150f5f5 100644
--- a/src/app/commands/cmd_background_from_layer.cpp
+++ b/src/app/commands/cmd_background_from_layer.cpp
@@ -65,7 +65,6 @@ void BackgroundFromLayerCommand::onExecute(Context* context)
{
ContextWriter writer(context);
Document* document(writer.document());
- Sprite* sprite(writer.sprite());
{
UndoTransaction undo_transaction(writer.context(), "Background from Layer");
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 743bd21..183ae49 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -708,6 +708,7 @@ void DocumentApi::moveCel(
ASSERT(dstSprite != NULL);
ASSERT(srcFrame >= 0 && srcFrame < srcSprite->totalFrames());
ASSERT(dstFrame >= 0);
+ (void)srcSprite; // To avoid unused variable warning on Release mode
clearCel(dstLayer, dstFrame);
addEmptyFramesTo(dstSprite, dstFrame);
@@ -777,6 +778,7 @@ void DocumentApi::copyCel(
ASSERT(dstSprite != NULL);
ASSERT(srcFrame >= 0 && srcFrame < srcSprite->totalFrames());
ASSERT(dstFrame >= 0);
+ (void)srcSprite; // To avoid unused variable warning on Release mode
clearCel(dstLayer, dstFrame);
addEmptyFramesTo(dstSprite, dstFrame);
@@ -825,6 +827,7 @@ void DocumentApi::swapCel(
ASSERT(sprite != NULL);
ASSERT(frame1 >= 0 && frame1 < sprite->totalFrames());
ASSERT(frame2 >= 0 && frame2 < sprite->totalFrames());
+ (void)sprite; // To avoid unused variable warning on Release mode
Cel* cel1 = layer->getCel(frame1);
Cel* cel2 = layer->getCel(frame2);
@@ -933,7 +936,6 @@ void DocumentApi::cropLayer(Layer* layer, int x, int y, int w, int h)
if (!layer->isImage())
return;
- color_t bgcolor = bgColor(layer);
Sprite* sprite = layer->sprite();
CelIterator it = ((LayerImage*)layer)->getCelBegin();
CelIterator end = ((LayerImage*)layer)->getCelEnd();
diff --git a/src/app/document_range_ops.cpp b/src/app/document_range_ops.cpp
index 7f407d9..77be0ea 100644
--- a/src/app/document_range_ops.cpp
+++ b/src/app/document_range_ops.cpp
@@ -145,7 +145,6 @@ static DocumentRange drop_range_op(
dstFrame = dstFrameBegin; srcFrame != srcFrameEnd; ) {
LayerImage* srcLayer = static_cast<LayerImage*>(layers[srcLayerIdx]);
LayerImage* dstLayer = static_cast<LayerImage*>(layers[dstLayerIdx]);
- color_t bgcolor = app_get_color_to_clear_layer(dstLayer);
switch (op) {
case Move: api.moveCel(srcLayer, srcFrame, dstLayer, dstFrame); break;
diff --git a/src/app/ui/editor/pixels_movement.cpp b/src/app/ui/editor/pixels_movement.cpp
index 5ab560d..c9e16ef 100644
--- a/src/app/ui/editor/pixels_movement.cpp
+++ b/src/app/ui/editor/pixels_movement.cpp
@@ -53,7 +53,6 @@ PixelsMovement::PixelsMovement(Context* context,
: m_reader(context)
, m_document(document)
, m_sprite(sprite)
- , m_layer(layer)
, m_undoTransaction(context, operationName)
, m_firstDrop(true)
, m_isDragging(false)
diff --git a/src/app/ui/editor/pixels_movement.h b/src/app/ui/editor/pixels_movement.h
index 0987df5..d82e6e0 100644
--- a/src/app/ui/editor/pixels_movement.h
+++ b/src/app/ui/editor/pixels_movement.h
@@ -112,7 +112,6 @@ namespace app {
const ContextReader m_reader;
Document* m_document;
Sprite* m_sprite;
- Layer* m_layer;
UndoTransaction m_undoTransaction;
bool m_firstDrop;
bool m_isDragging;
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 2fb6da0..71ac33e 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -994,8 +994,6 @@ void Timeline::onAfterLayerChanged(Editor* editor)
void Timeline::setCursor(ui::Message* msg, const gfx::Point& mousePos)
{
- int mx = mousePos.x - getBounds().x;
-
// Scrolling.
if (m_state == STATE_SCROLLING || m_scroll) {
jmouse_set_cursor(kScrollCursor);
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 2ec7a55..ecd9586 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -246,7 +246,6 @@ void clipboard::paste()
Document* dstDoc = editor->document();
Sprite* dstSpr = dstDoc->sprite();
- color_t bgcolor = 0;
switch (get_current_format()) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list