summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-08-27 11:07:21 +1000
committer Vas Crabb <vas@vastheman.com>2017-08-27 11:07:21 +1000
commitec3caa98bdcab04b0cb90b3cf1c1eb740433dfd6 (patch)
tree337a198314bc8532025a9a1107430de7aafc1388 /src/tools
parentd969bebe1a47abe407c3ab280227213856b257bd (diff)
srcclean (nw)
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/imgtool/library.h6
-rw-r--r--src/tools/imgtool/modules/hp9845_tape.cpp2
-rw-r--r--src/tools/imgtool/modules/mac.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h
index 160d6952a83..ec508bcbd0e 100644
--- a/src/tools/imgtool/library.h
+++ b/src/tools/imgtool/library.h
@@ -129,9 +129,9 @@ namespace imgtool
}
}
- uint64_t m_size;
- type_t m_type;
- std::string m_name;
+ uint64_t m_size;
+ type_t m_type;
+ std::string m_name;
};
}
diff --git a/src/tools/imgtool/modules/hp9845_tape.cpp b/src/tools/imgtool/modules/hp9845_tape.cpp
index bdf3fdf28ca..b7edf371f88 100644
--- a/src/tools/imgtool/modules/hp9845_tape.cpp
+++ b/src/tools/imgtool/modules/hp9845_tape.cpp
@@ -150,7 +150,7 @@
#define BYTES_USED_MASK 0x00ff // Mask of "bytes used" field
#define FORMAT_SECT_SIZE ((tape_pos_t)(2.85 * hti_format_t::ONE_INCH_POS)) // Size of sectors including padding: 2.85"
#define PREAMBLE_WORD 0 // Value of preamble word
-#define WORDS_PER_HEADER_N_SECTOR (WORDS_PER_SECTOR + 5)
+#define WORDS_PER_HEADER_N_SECTOR (WORDS_PER_SECTOR + 5)
#define MIN_IRG_SIZE ((tape_pos_t)(0.066 * hti_format_t::ONE_INCH_POS)) // Minimum size of IRG gaps: 0.066"
// File types
diff --git a/src/tools/imgtool/modules/mac.cpp b/src/tools/imgtool/modules/mac.cpp
index a65284f0b4e..546a153a7e8 100644
--- a/src/tools/imgtool/modules/mac.cpp
+++ b/src/tools/imgtool/modules/mac.cpp
@@ -6076,7 +6076,7 @@ static bool load_icon(uint32_t *dest, const void *resource_fork, uint64_t resour
uint8_t color = get_pixel(src, width, height, bpp, x, y);
// then check the mask
- bool is_masked = has_mask
+ bool is_masked = has_mask
? get_pixel(src + frame_length, width, height, bpp, x, y) != 0
: dest[y * width + x] >= 0x80000000;