[Scummvm-git-logs] scummvm master -> ec9869b253e42b536896bd50b38bd5c8b985fa6a

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3d71d8e08c COMMON: Move huffman.h to common/compression/
ec9869b253 TESTS: Move huffman.h into new compression/ subfolder


Commit: 3d71d8e08cb94b1b646d21eaa39fed9dc7a57f36
    https://github.com/scummvm/scummvm/commit/3d71d8e08cb94b1b646d21eaa39fed9dc7a57f36
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-07-15T02:56:12+02:00

Commit Message:
COMMON: Move huffman.h to common/compression/

Changed paths:
  A common/compression/huffman.h
  R common/huffman.h
    audio/decoders/wma.cpp
    engines/macventure/macventure.h
    image/codecs/svq1.cpp
    test/common/huffman.h
    video/bink_decoder.cpp
    video/psx_decoder.cpp


diff --git a/audio/decoders/wma.cpp b/audio/decoders/wma.cpp
index 59c166c5453..8caa97dd09d 100644
--- a/audio/decoders/wma.cpp
+++ b/audio/decoders/wma.cpp
@@ -26,7 +26,7 @@
 #include "common/math.h"
 #include "common/error.h"
 #include "common/memstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 
 #include "math/mdct.h"
 #include "math/sinewindows.h"
diff --git a/common/huffman.h b/common/compression/huffman.h
similarity index 100%
rename from common/huffman.h
rename to common/compression/huffman.h
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index 159c6dd21d5..071ead42876 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -36,7 +36,7 @@
 #include "common/debug.h"
 #include "common/random.h"
 #include "common/macresman.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 #include "common/savefile.h"
 
 #include "gui/debugger.h"
diff --git a/image/codecs/svq1.cpp b/image/codecs/svq1.cpp
index 47dde72bf7c..5f8d34d539d 100644
--- a/image/codecs/svq1.cpp
+++ b/image/codecs/svq1.cpp
@@ -32,7 +32,7 @@
 #include "common/system.h"
 #include "common/debug.h"
 #include "common/textconsole.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 
 #include "graphics/yuv_to_rgb.h"
 
diff --git a/test/common/huffman.h b/test/common/huffman.h
index 3e3956a3213..1ebaa1f44fd 100644
--- a/test/common/huffman.h
+++ b/test/common/huffman.h
@@ -1,10 +1,10 @@
 #include <cxxtest/TestSuite.h>
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 #include "common/bitstream.h"
 #include "common/memstream.h"
 
 /**
-* A test suite for the Huffman decoder in common/huffman.h
+* A test suite for the Huffman decoder in common/compression/huffman.h
 * The encoding used comes from the example on the Wikipedia page
 * for Huffman.
 * TODO: It could be improved by generating one at runtime.
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 0c371d6447c..63b761e59e7 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -34,7 +34,7 @@
 #include "common/file.h"
 #include "common/str.h"
 #include "common/bitstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 #include "common/system.h"
 
 #include "graphics/yuv_to_rgb.h"
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 8a1b4355b1a..c7f9f4820a2 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -25,7 +25,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/adpcm.h"
 #include "common/bitstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/textconsole.h"


Commit: ec9869b253e42b536896bd50b38bd5c8b985fa6a
    https://github.com/scummvm/scummvm/commit/ec9869b253e42b536896bd50b38bd5c8b985fa6a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-07-15T02:56:12+02:00

Commit Message:
TESTS: Move huffman.h into new compression/ subfolder

Changed paths:
  A test/common/compression/huffman.h
  R test/common/huffman.h


diff --git a/test/common/huffman.h b/test/common/compression/huffman.h
similarity index 100%
rename from test/common/huffman.h
rename to test/common/compression/huffman.h