From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dalai@blender.org>
Date: Thu, 19 Mar 2020 09:33:03 +0100
Subject: Cleanup: `make format` after SortedIncludes change

---
 source/blender/imbuf/intern/dds/BlockDXT.cpp          |  4 ++--
 source/blender/imbuf/intern/dds/BlockDXT.h            |  2 +-
 source/blender/imbuf/intern/dds/ColorBlock.cpp        |  2 +-
 source/blender/imbuf/intern/dds/DirectDrawSurface.cpp |  4 ++--
 source/blender/imbuf/intern/dds/DirectDrawSurface.h   |  4 ++--
 source/blender/imbuf/intern/dds/FlipDXT.cpp           |  6 +++---
 source/blender/imbuf/intern/dds/Image.h               |  2 +-
 source/blender/imbuf/intern/dds/dds_api.cpp           | 14 +++++++-------
 8 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'source/blender/imbuf/intern/dds')

diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp
index b1ca6221753..4397c1febab 100644
--- a/source/blender/imbuf/intern/dds/BlockDXT.cpp
+++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp
@@ -48,10 +48,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
+#include <BlockDXT.h>
+#include <ColorBlock.h>
 #include <Common.h>
 #include <Stream.h>
-#include <ColorBlock.h>
-#include <BlockDXT.h>
 
 /* ---------------------------------------------------------------------------
  * BlockDXT1
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h
index b167fba71a2..16937bce042 100644
--- a/source/blender/imbuf/intern/dds/BlockDXT.h
+++ b/source/blender/imbuf/intern/dds/BlockDXT.h
@@ -51,9 +51,9 @@
 #ifndef __BLOCKDXT_H__
 #define __BLOCKDXT_H__
 
-#include <Common.h>
 #include <Color.h>
 #include <ColorBlock.h>
+#include <Common.h>
 #include <Stream.h>
 
 /// DXT1 block.
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index cbc85962a36..69757d797b5 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -28,8 +28,8 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
 #include <ColorBlock.h>
-#include <Image.h>
 #include <Common.h>
+#include <Image.h>
 
 #if 0
 // Get approximate luminance.
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index 3f222a096ac..ab68d933c6f 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -48,13 +48,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <DirectDrawSurface.h>
 #include <BlockDXT.h>
+#include <DirectDrawSurface.h>
 #include <PixelFormat.h>
 
+#include <math.h>    // sqrt
 #include <stdio.h>   // printf
 #include <stdlib.h>  // malloc
-#include <math.h>    // sqrt
 #include <sys/types.h>
 
 /*** declarations ***/
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index 54bd1ad2dcd..f12c45d11df 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -51,10 +51,10 @@
 #ifndef __DIRECTDRAWSURFACE_H__
 #define __DIRECTDRAWSURFACE_H__
 
-#include <Common.h>
-#include <Stream.h>
 #include <ColorBlock.h>
+#include <Common.h>
 #include <Image.h>
+#include <Stream.h>
 
 struct DDSPixelFormat {
   uint size;
diff --git a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp
index bfd19f40493..f5c937654b3 100644
--- a/source/blender/imbuf/intern/dds/FlipDXT.cpp
+++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp
@@ -38,11 +38,11 @@
 
 #include <string.h>
 
-#include <Common.h>
-#include <Stream.h>
-#include <ColorBlock.h>
 #include <BlockDXT.h>
+#include <ColorBlock.h>
+#include <Common.h>
 #include <FlipDXT.h>
+#include <Stream.h>
 
 // A function that flips a DXTC block.
 typedef void (*FlipBlockFunction)(uint8_t *block);
diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h
index 1aa60ef48ca..2922d5cfda3 100644
--- a/source/blender/imbuf/intern/dds/Image.h
+++ b/source/blender/imbuf/intern/dds/Image.h
@@ -30,8 +30,8 @@
 #ifndef __IMAGE_H__
 #define __IMAGE_H__
 
-#include "Common.h"
 #include "Color.h"
+#include "Common.h"
 
 /// 32 bit RGBA image.
 class Image {
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index 098b695b8a3..832b380bbc2 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -22,13 +22,13 @@ extern "C" {
 #include "BLI_utildefines.h"
 }
 
-#include <stddef.h>
-#include <dds_api.h>
-#include <Stream.h>
 #include <DirectDrawSurface.h>
 #include <FlipDXT.h>
-#include <stdio.h>  // printf
+#include <Stream.h>
+#include <dds_api.h>
 #include <fstream>
+#include <stddef.h>
+#include <stdio.h>  // printf
 
 #if defined(WIN32)
 #  include "utfconv.h"
@@ -36,10 +36,10 @@ extern "C" {
 
 extern "C" {
 
-#include "imbuf.h"
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
 #include "IMB_allocimbuf.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+#include "imbuf.h"
 
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
-- 
cgit v1.2.3